Skip to content

Commit 4705cf1

Browse files
author
Ming Lei
committed
block: move blk_mq_add_queue_tag_set() after blk_mq_map_swqueue()
JIRA: https://issues.redhat.com/browse/RHEL-106845 commit f24d47e Author: Ming Lei <ming.lei@redhat.com> Date: Mon May 5 22:17:39 2025 +0800 block: move blk_mq_add_queue_tag_set() after blk_mq_map_swqueue() Move blk_mq_add_queue_tag_set() after blk_mq_map_swqueue(), and publish this request queue to tagset after everything is setup. This way is safe because BLK_MQ_F_TAG_QUEUE_SHARED isn't used by blk_mq_map_swqueue(), and this flag is mainly checked in fast IO code path. Prepare for removing ->elevator_lock from blk_mq_map_swqueue() which is supposed to be called when elevator switch can't be done. Reviewed-by: Nilay Shroff <nilay@linux.ibm.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reported-by: Nilay Shroff <nilay@linux.ibm.com> Closes: https://lore.kernel.org/linux-block/567cb7ab-23d6-4cee-a915-c8cdac903ddd@linux.ibm.com/ Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20250505141805.2751237-2-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent 4ad7cd2 commit 4705cf1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

block/blk-mq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4625,8 +4625,8 @@ int blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
46254625
q->nr_requests = set->queue_depth;
46264626

46274627
blk_mq_init_cpu_queues(q, set->nr_hw_queues);
4628-
blk_mq_add_queue_tag_set(set, q);
46294628
blk_mq_map_swqueue(q);
4629+
blk_mq_add_queue_tag_set(set, q);
46304630
return 0;
46314631

46324632
err_hctxs:

0 commit comments

Comments
 (0)