From: Bart Van Assche <bvanassche@acm.org>

Date: Thu, 13 May 2021 10:15:29 -0700

Subject: [PATCH] blk-mq: Swap two calls in blk_mq_exit_queue()

Git-commit: 630ef623ed26c18a457cdc070cf24014e50129c2

Patch-mainline: v5.13-rc2

References: git-fixes

If a tag set is shared across request queues (e.g. SCSI LUNs) then the

block layer core keeps track of the number of active request queues in

tags->active_queues. blk_mq_tag_busy() and blk_mq_tag_idle() update that

atomic counter if the hctx flag BLK_MQ_F_TAG_QUEUE_SHARED is set. Make

sure that blk_mq_exit_queue() calls blk_mq_tag_idle() before that flag is

cleared by blk_mq_del_queue_tag_set().

Cc: Christoph Hellwig <hch@infradead.org>

Cc: Ming Lei <ming.lei@redhat.com>

Cc: Hannes Reinecke <hare@suse.com>

Fixes: 0d2602ca30e4 ("blk-mq: improve support for shared tags maps")

Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Reviewed-by: Ming Lei <ming.lei@redhat.com>

Link: https://lore.kernel.org/r/20210513171529.7977-1-bvanassche@acm.org

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 block/blk-mq.c | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c

index 28ef0248efba..c86c01bfecdb 100644

--- a/block/blk-mq.c

+++ b/block/blk-mq.c

@@ -3286,10 +3286,12 @@ EXPORT_SYMBOL(blk_mq_init_allocated_queue);

 /* tags can _not_ be used after returning from blk_mq_exit_queue */

 void blk_mq_exit_queue(struct request_queue *q)

 {

-	struct blk_mq_tag_set	*set = q->tag_set;

+	struct blk_mq_tag_set *set = q->tag_set;

-	blk_mq_del_queue_tag_set(q);

+	/* Checks hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED. */

 	blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);

+	/* May clear BLK_MQ_F_TAG_QUEUE_SHARED in hctx->flags. */

+	blk_mq_del_queue_tag_set(q);

 }

 static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)

-- 

2.29.2