aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrea Parri <andrea.parri@amarulasolutions.com>2019-05-20 17:23:57 (GMT)
committerJens Axboe <axboe@kernel.dk>2019-05-23 16:25:26 (GMT)
commita0934fd2b1208458e55fc4b48f55889809fce666 (patch)
tree9a0dbea2ac872319f95069fdeb557eafcae63c29 /lib
parentf381c6a4bd0ae0fde2d6340f1b9bb0f58d915de6 (diff)
downloadkernel_replicant_linux-a0934fd2b1208458e55fc4b48f55889809fce666.zip
kernel_replicant_linux-a0934fd2b1208458e55fc4b48f55889809fce666.tar.gz
kernel_replicant_linux-a0934fd2b1208458e55fc4b48f55889809fce666.tar.bz2
sbitmap: fix improper use of smp_mb__before_atomic()
This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive. Replace the barrier with an smp_mb(). Fixes: 6c0ca7ae292ad ("sbitmap: fix wakeup hang after sbq resize") Cc: stable@vger.kernel.org Reported-by: "Paul E. McKenney" <paulmck@linux.ibm.com> Reported-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Omar Sandoval <osandov@fb.com> Cc: Ming Lei <ming.lei@redhat.com> Cc: linux-block@vger.kernel.org Cc: "Paul E. McKenney" <paulmck@linux.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'lib')
-rw-r--r--lib/sbitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sbitmap.c b/lib/sbitmap.c
index 155fe38..4a7fc49 100644
--- a/lib/sbitmap.c
+++ b/lib/sbitmap.c
@@ -435,7 +435,7 @@ static void sbitmap_queue_update_wake_batch(struct sbitmap_queue *sbq,
* to ensure that the batch size is updated before the wait
* counts.
*/
- smp_mb__before_atomic();
+ smp_mb();
for (i = 0; i < SBQ_WAIT_QUEUES; i++)
atomic_set(&sbq->ws[i].wait_cnt, 1);
}