Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

blk-mq: blk_mq_freeze_queue() should allow nesting

While converting to percpu_ref for freezing, add703fda981 ("blk-mq:
use percpu_ref for mq usage count") incorrectly made
blk_mq_freeze_queue() misbehave when freezing is nested due to
percpu_ref_kill() being invoked on an already killed ref.

Fix it by making blk_mq_freeze_queue() kill and kick the queue only
for the outermost freeze attempt. All the nested ones can simply wait
for the ref to reach zero.

While at it, remove unnecessary @wake initialization from
blk_mq_unfreeze_queue().

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

authored by

Tejun Heo and committed by
Jens Axboe
cddd5d17 a68aafa5

+8 -4
+8 -4
block/blk-mq.c
··· 112 112 */ 113 113 void blk_mq_freeze_queue(struct request_queue *q) 114 114 { 115 + bool freeze; 116 + 115 117 spin_lock_irq(q->queue_lock); 116 - q->mq_freeze_depth++; 118 + freeze = !q->mq_freeze_depth++; 117 119 spin_unlock_irq(q->queue_lock); 118 120 119 - percpu_ref_kill(&q->mq_usage_counter); 120 - blk_mq_run_queues(q, false); 121 + if (freeze) { 122 + percpu_ref_kill(&q->mq_usage_counter); 123 + blk_mq_run_queues(q, false); 124 + } 121 125 wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->mq_usage_counter)); 122 126 } 123 127 124 128 static void blk_mq_unfreeze_queue(struct request_queue *q) 125 129 { 126 - bool wake = false; 130 + bool wake; 127 131 128 132 spin_lock_irq(q->queue_lock); 129 133 wake = !--q->mq_freeze_depth;