Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e1f85b authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

blk-mq: don't create hctx debugfs dir until q->debugfs_dir is created 



[ Upstream commit f3ec5d11554778c24ac8915e847223ed71d104fc ]

blk_mq_debugfs_register_hctx() can be called by blk_mq_update_nr_hw_queues
when gendisk isn't added yet, such as nvme tcp.

Fixes the warning of 'debugfs: Directory 'hctx0' with parent '/' already present!'
which can be observed reliably when running blktests nvme/005.

Fixes: 6cfc0081 ("blk-mq: no need to check return value of debugfs_create functions")
Reported-by: default avatarYi Zhang <yi.zhang@redhat.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Tested-by: default avatarYi Zhang <yi.zhang@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220711090808.259682-1-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bee4d2ab

block/blk-mq-debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -883,6 +883,9 @@ void blk_mq_debugfs_register_hctx(struct request_queue *q, 
	char name[20];

	int i;



	if (!q->debugfs_dir)

		return;



	snprintf(name, sizeof(name), "hctx%u", hctx->queue_num);

	hctx->debugfs_dir = debugfs_create_dir(name, q->debugfs_dir);