Skip to content

Commit 9dc7a88

Browse files
Ming Leiaxboe
Ming Lei
authored andcommitted
block: move hctx debugfs/sysfs registering out of freezing queue
Move hctx debugfs/sysfs register out of freezing queue in __blk_mq_update_nr_hw_queues(), so that the following lockdep dependency can be killed: #2 (&q->q_usage_counter(io)torvalds#16){++++}-{0:0}: #1 (fs_reclaim){+.+.}-{0:0}: #0 (&sb->s_type->i_mutex_key#3){+.+.}-{4:4}: //debugfs And registering/un-registering hctx debugfs/sysfs does not require queue to be frozen: - hctx sysfs attributes show() are drained when removing kobject, and there isn't store() implementation for hctx sysfs attributes - debugfs entry read() is drained too when removing debugfs directory, and there isn't write() implementation for hctx debugfs too - so it is safe to register/unregister hctx sysfs/debugfs without freezing queue because the cod paths changes nothing, and we just need to keep hctx live Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Nilay Shroff <nilay@linux.ibm.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20250505141805.2751237-23-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 559dc11 commit 9dc7a88

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

block/blk-mq.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5005,14 +5005,14 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
50055005
return;
50065006

50075007
memflags = memalloc_noio_save();
5008-
list_for_each_entry(q, &set->tag_list, tag_set_list)
5009-
blk_mq_freeze_queue_nomemsave(q);
5010-
50115008
list_for_each_entry(q, &set->tag_list, tag_set_list) {
50125009
blk_mq_debugfs_unregister_hctxs(q);
50135010
blk_mq_sysfs_unregister_hctxs(q);
50145011
}
50155012

5013+
list_for_each_entry(q, &set->tag_list, tag_set_list)
5014+
blk_mq_freeze_queue_nomemsave(q);
5015+
50165016
if (blk_mq_realloc_tag_set_tags(set, nr_hw_queues) < 0)
50175017
goto reregister;
50185018

@@ -5035,16 +5035,15 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
50355035
blk_mq_map_swqueue(q);
50365036
}
50375037

5038+
/* elv_update_nr_hw_queues() unfreeze queue for us */
5039+
list_for_each_entry(q, &set->tag_list, tag_set_list)
5040+
elv_update_nr_hw_queues(q);
5041+
50385042
reregister:
50395043
list_for_each_entry(q, &set->tag_list, tag_set_list) {
50405044
blk_mq_sysfs_register_hctxs(q);
50415045
blk_mq_debugfs_register_hctxs(q);
50425046
}
5043-
5044-
/* elv_update_nr_hw_queues() unfreeze queue for us */
5045-
list_for_each_entry(q, &set->tag_list, tag_set_list)
5046-
elv_update_nr_hw_queues(q);
5047-
50485047
memalloc_noio_restore(memflags);
50495048

50505049
/* Free the excess tags when nr_hw_queues shrink. */

0 commit comments

Comments
 (0)