diff options
| author | Andrea Parri <andrea.parri@amarulasolutions.com> | 2019-05-20 19:23:57 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-10-05 16:19:44 +0100 |
| commit | 25a7ef987b00844ea30e88cec82e78b23e8546b3 (patch) | |
| tree | 9055d48284ef08d6322d2fbce9738e1b390515b7 /block | |
| parent | 4fd933e50b9278fe4ff061658aff987b5e90792f (diff) | |
| download | linux-stable-25a7ef987b00844ea30e88cec82e78b23e8546b3.tar.gz linux-stable-25a7ef987b00844ea30e88cec82e78b23e8546b3.tar.bz2 linux-stable-25a7ef987b00844ea30e88cec82e78b23e8546b3.zip | |
sbitmap: fix improper use of smp_mb__before_atomic()
commit a0934fd2b1208458e55fc4b48f55889809fce666 upstream.
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")
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>
[bwh: Backported to 3.16: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 7f9b41f7ad8a..d9675a199c6d 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -499,7 +499,7 @@ static void bt_update_count(struct blk_mq_bitmap_tags *bt, * Pairs with the memory barrier in bt_clear_tag() to ensure * that the batch size is updated before the wait counts. */ - smp_mb__before_atomic(); + smp_mb(); for (i = 0; i < BT_WAIT_QUEUES; i++) atomic_set(&bt->bs[i].wait_cnt, 1); } |