Commit 1b97871b authored Apr 30, 2019 by Ming Lei Committed by Jens Axboe May 04, 2019

blk-mq: move cancel of hctx->run_work into blk_mq_hw_sysfs_release



hctx is always released after requeue is freed.

With holding queue's kobject refcount, it is safe for driver to run queue,
so one run queue might be scheduled after blk_sync_queue() is done.

So moving the cancel of hctx->run_work into blk_mq_hw_sysfs_release()
for avoiding run released queue.

Cc: Dongli Zhang <dongli.zhang@oracle.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Bart Van Assche <bart.vanassche@wdc.com>
Cc: linux-scsi@vger.kernel.org,
Cc: Martin K . Petersen <martin.petersen@oracle.com>,
Cc: Christoph Hellwig <hch@lst.de>,
Cc: James E . J . Bottomley <jejb@linux.vnet.ibm.com>,
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 2f8f1336

block/blk-core.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -233,14 +233,6 @@ void blk_sync_queue(struct request_queue *q)
		{
		del_timer_sync(&q->timeout);
		cancel_work_sync(&q->timeout_work);

		if (queue_is_mq(q)) {
		struct blk_mq_hw_ctx *hctx;
		int i;

		queue_for_each_hw_ctx(q, hctx, i)
		cancel_delayed_work_sync(&hctx->run_work);
		}
		}
		EXPORT_SYMBOL(blk_sync_queue);

block/blk-mq-sysfs.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj)
		struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx,
		kobj);

		cancel_delayed_work_sync(&hctx->run_work);

		if (hctx->flags & BLK_MQ_F_BLOCKING)
		cleanup_srcu_struct(hctx->srcu);
		blk_free_flush_queue(hctx->fq);

Admin message