Re: [PATCH v8 8/8] nbd: add pre_defined_connections module parameter for pre-created devices

在 2026/8/6 17:26, yu kuai 写道:
> Hi,
> 
> 在 2026/8/5 20:29, Yang Erkun 写道:
>> blk_mq_update_nr_hw_queues() in nbd_start_device() may cause a queue
>> freeze.  The previous commit addressed this for newly created nbd
>> devices by setting the expected nr_hw_queues in nbd_dev_add().  However,
>> when reusing an old inactive nbd device, the queue freeze can still
>> occur if the old nbd->tag_set->nr_hw_queues does not match the new
>> socket connection count.  Inactive nbd devices can originate from two
>> sources: loading the nbd module with nbds_max, which sets the default
>> nr_hw_queues to 1, and the netlink method, which sets nr_hw_queues
>> according to the expected number of socket connections.  For the first
>> case, add a module parameter so the default nr_hw_queues can be
>> changed.  Users who know their expected number of connections can then
>> prevent queue freezes on pre-created devices via nbds_max.
>>
>> Before this patchset:
>> real    0m2.195s
>> user    0m0.005s
>> sys     0m0.022s
>>
>> After this patchset:
>> real    0m0.090s
>> user    0m0.004s
>> sys     0m0.018s
>>
>> Signed-off-by: Yang Erkun <[email protected]>
>> ---
>>    drivers/block/nbd.c | 16 +++++++++++++++-
>>    1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> index 6c4aa19ea11a..ffce519bf008 100644
>> --- a/drivers/block/nbd.c
>> +++ b/drivers/block/nbd.c
>> @@ -166,6 +166,7 @@ static struct dentry *nbd_dbg_dir;
>>    
>>    static unsigned int nbds_max = 16;
>>    static int max_part = 16;
>> +static int pre_defined_connections = 1;
>>    static int part_shift;
>>    
>>    static int nbd_dev_dbg_init(struct nbd_device *nbd);
>> @@ -2712,6 +2713,12 @@ static int __init nbd_init(void)
>>    	if (nbds_max > 1UL << (MINORBITS - part_shift))
>>    		return -EINVAL;
>>    
>> +	/* An excessively large value will be adjusted in blk_mq_alloc_tag_set */
>> +	if (pre_defined_connections < 1) {
>> +		pr_err("pre_defined_connections must be >= 1\n");
> 
> It's also better to add NR_CPUS checking for upper bound, because the nr_hw_queues is passed
> directly to __blk_mq_realloc_hw_ctxs() for memory allocation.

Hi,

Like the comment above said, nbd_dev_add->blk_mq_alloc_tag_set

4876         if (set->nr_maps == 1 && set->nr_hw_queues > nr_cpu_ids)
4877                 set->nr_hw_queues = nr_cpu_ids;

this will help do the same thing. So I does not the check here.

Thanks,
Erkun.

> 
>> +		return -EINVAL;
>> +	}
>> +
>>    	if (register_blkdev(NBD_MAJOR, "nbd"))
>>    		return -EIO;
>>    
>> @@ -2728,8 +2735,12 @@ static int __init nbd_init(void)
>>    	}
>>    	nbd_dbg_init();
>>    
>> +	/*
>> +	 * Set to the intended connection count so nbd_start_device() can skip
>> +	 * the queue-freezing blk_mq_update_nr_hw_queues() call.
>> +	 */
>>    	for (i = 0; i < nbds_max; i++)
>> -		nbd_dev_add(i, 1, 1);
>> +		nbd_dev_add(i, 1, pre_defined_connections);
>>    	return 0;
>>    }
>>    
>> @@ -2790,3 +2801,6 @@ module_param(nbds_max, int, 0444);
>>    MODULE_PARM_DESC(nbds_max, "number of network block devices to initialize (default: 16)");
>>    module_param(max_part, int, 0444);
>>    MODULE_PARM_DESC(max_part, "number of partitions per device (default: 16)");
>> +module_param(pre_defined_connections, int, 0444);
>> +MODULE_PARM_DESC(pre_defined_connections,
>> +"number of connections for devices pre-created at module load (default: 1)");
>