diff options
| author | Andrea Parri | 2019-05-20 19:23:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-31 15:46:00 +0200 |
| commit | ac7480a5b504e77387901aaee0f5c64a37a0793a (patch) | |
| tree | aa518ca137f11cb8c2599a75ab64302169c82619 /lib | |
| parent | bio: fix improper use of smp_mb__before_atomic() (diff) | |
| download | kernel-qcow2-linux-ac7480a5b504e77387901aaee0f5c64a37a0793a.tar.gz kernel-qcow2-linux-ac7480a5b504e77387901aaee0f5c64a37a0793a.tar.xz kernel-qcow2-linux-ac7480a5b504e77387901aaee0f5c64a37a0793a.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 fdd1b8aa8ac6..0572ac340325 100644 --- a/lib/sbitmap.c +++ b/lib/sbitmap.c @@ -356,7 +356,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); } |