blk-mq: fix a memory ordering bug in blk_mq_queue_enter()
authorTejun Heo <tj@kernel.org>
Wed, 18 Jun 2014 15:21:08 +0000 (11:21 -0400)
committerJens Axboe <axboe@fb.com>
Tue, 1 Jul 2014 16:27:06 +0000 (10:27 -0600)
commit531ed6261e7466907418b1a9971a5c71d7d250e4
treec4620c6c04575eb0d3fa2d24eb418a8dd8859a1e
parent17737d3b5997ac9f810967f0c6014d124ec39490
blk-mq: fix a memory ordering bug in blk_mq_queue_enter()

blk-mq uses a percpu_counter to keep track of how many usages are in
flight.  The percpu_counter is drained while freezing to ensure that
no usage is left in-flight after freezing is complete.

blk_mq_queue_enter/exit() and blk_mq_[un]freeze_queue() implement this
per-cpu gating mechanism; unfortunately, it contains a subtle bug -
smp_wmb() in blk_mq_queue_enter() doesn't prevent prevent the cpu from
fetching @q->bypass_depth before incrementing @q->mq_usage_counter and
if freezing happens inbetween the caller can slip through and freezing
can be complete while there are active users.

Use smp_mb() instead so that bypass_depth and mq_usage_counter
modifications and tests are properly interlocked.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-mq.c