diff options
| author | Andrea Parri <andrea.parri@amarulasolutions.com> | 2019-05-20 19:23:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:47:10 -0700 |
| commit | fce095450bf7ecab866b2311e310463796ca746b (patch) | |
| tree | c78e7529c17cb7f0ce16de8202c6069901479f98 /lib | |
| parent | f0b882dd9ef511e2e823eb0160558bc22e6b1cfa (diff) | |
| download | linux-stable-fce095450bf7ecab866b2311e310463796ca746b.tar.gz linux-stable-fce095450bf7ecab866b2311e310463796ca746b.tar.bz2 linux-stable-fce095450bf7ecab866b2311e310463796ca746b.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")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sbitmap.c b/lib/sbitmap.c index 80aa8d5463fa..8e467917e0d1 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -338,7 +338,7 @@ void sbitmap_queue_resize(struct sbitmap_queue *sbq, unsigned int depth) * Pairs with the memory barrier in sbq_wake_up() 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); } |