lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 139/545] blk-mq: dont create hctx debugfs dir until q->debugfs_dir is created
    Date
    From: Ming Lei <ming.lei@redhat.com>

    [ 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: 6cfc0081b046 ("blk-mq: no need to check return value of debugfs_create functions")
    Reported-by: Yi Zhang <yi.zhang@redhat.com>
    Signed-off-by: Ming Lei <ming.lei@redhat.com>
    Tested-by: Yi Zhang <yi.zhang@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Link: https://lore.kernel.org/r/20220711090808.259682-1-ming.lei@redhat.com
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/blk-mq-debugfs.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
    index b5f26082b959..212e1e795469 100644
    --- a/block/blk-mq-debugfs.c
    +++ b/block/blk-mq-debugfs.c
    @@ -881,6 +881,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);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:04    [W:4.463 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site