Re: [PATCHv4 net-next 1/1] net/mlx5: Fix build -Wframe-larger-than warnings

[Zhu Yanjun <yanjun.zhu@linux.dev>]

在 2025/7/22 6:08, Tariq Toukan 写道:
>> +    auto_desc = kvzalloc(sizeof(*auto_desc), GFP_KERNEL);
>> +    if (!auto_desc)
>> +        return ERR_PTR(-ENOMEM);
> 
> Missing xa_erase.

It's a minor oversight. I will address it and resend the patch without 
incrementing the version number.

Zhu Yanjun>
>> +
>>       if (pool->irqs_per_cpu) {
>>           if (cpumask_weight(&af_desc->mask) > 1)
>>               /* if req_mask contain more then one CPU, set the least 
>> loadad CPU
>>                * of req_mask
>>                */
>>               cpumask_set_cpu(cpu_get_least_loaded(pool, &af_desc->mask),
>> -                    &auto_desc.mask);
>> +                    &auto_desc->mask);
>>           else
>>               cpu_get(pool, cpumask_first(&af_desc->mask));
>>       }
>> +
>>       irq = mlx5_irq_alloc(pool, irq_index,
>> -                 cpumask_empty(&auto_desc.mask) ? af_desc : &auto_desc,
>> +                 cpumask_empty(&auto_desc->mask) ? af_desc : auto_desc,
>>                    NULL);
>>       if (IS_ERR(irq))
>>           xa_erase(&pool->irqs, irq_index);
>> +
>> +    kvfree(auto_desc);
>> +
>>       return irq;
>>   }
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c b/ 
>> drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
>> index 40024cfa3099..692ef9c2f729 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c
>> @@ -470,26 +470,32 @@ void mlx5_ctrl_irq_release(struct mlx5_core_dev 
>> *dev, struct mlx5_irq *ctrl_irq)
>>   struct mlx5_irq *mlx5_ctrl_irq_request(struct mlx5_core_dev *dev)
>>   {
>>       struct mlx5_irq_pool *pool = ctrl_irq_pool_get(dev);
>> -    struct irq_affinity_desc af_desc;
>> +    struct irq_affinity_desc *af_desc;
>>       struct mlx5_irq *irq;
>> -    cpumask_copy(&af_desc.mask, cpu_online_mask);
>> -    af_desc.is_managed = false;
>> +    af_desc = kvzalloc(sizeof(*af_desc), GFP_KERNEL);
>> +    if (!af_desc)
>> +        return ERR_PTR(-ENOMEM);
>> +
>> +    cpumask_copy(&af_desc->mask, cpu_online_mask);
>> +    af_desc->is_managed = false;
>>       if (!mlx5_irq_pool_is_sf_pool(pool)) {
>>           /* In case we are allocating a control IRQ from a pci 
>> device's pool.
>>            * This can happen also for a SF if the SFs pool is empty.
>>            */
>>           if (!pool->xa_num_irqs.max) {
>> -            cpumask_clear(&af_desc.mask);
>> +            cpumask_clear(&af_desc->mask);
>>               /* In case we only have a single IRQ for PF/VF */
>> -            cpumask_set_cpu(cpumask_first(cpu_online_mask), 
>> &af_desc.mask);
>> +            cpumask_set_cpu(cpumask_first(cpu_online_mask), &af_desc- 
>> >mask);
>>           }
>>           /* Allocate the IRQ in index 0. The vector was already 
>> allocated */
>> -        irq = irq_pool_request_vector(pool, 0, &af_desc, NULL);
>> +        irq = irq_pool_request_vector(pool, 0, af_desc, NULL);
>>       } else {
>> -        irq = mlx5_irq_affinity_request(dev, pool, &af_desc);
>> +        irq = mlx5_irq_affinity_request(dev, pool, af_desc);
>>       }
>> +    kvfree(af_desc);
>> +
>>       return irq;
>>   }
>> @@ -548,16 +554,26 @@ struct mlx5_irq *mlx5_irq_request_vector(struct 
>> mlx5_core_dev *dev, u16 cpu,
>>   {
>>       struct mlx5_irq_table *table = mlx5_irq_table_get(dev);
>>       struct mlx5_irq_pool *pool = table->pcif_pool;
>> -    struct irq_affinity_desc af_desc;
>>       int offset = MLX5_IRQ_VEC_COMP_BASE;
>> +    struct irq_affinity_desc *af_desc;
>> +    struct mlx5_irq *irq;
>> +
>> +    af_desc = kvzalloc(sizeof(*af_desc), GFP_KERNEL);
>> +    if (!af_desc)
>> +        return ERR_PTR(-ENOMEM);
>>       if (!pool->xa_num_irqs.max)
>>           offset = 0;
>> -    af_desc.is_managed = false;
>> -    cpumask_clear(&af_desc.mask);
>> -    cpumask_set_cpu(cpu, &af_desc.mask);
>> -    return mlx5_irq_request(dev, vecidx + offset, &af_desc, rmap);
>> +    af_desc->is_managed = false;
>> +    cpumask_clear(&af_desc->mask);
>> +    cpumask_set_cpu(cpu, &af_desc->mask);
>> +
>> +    irq = mlx5_irq_request(dev, vecidx + offset, af_desc, rmap);
>> +
>> +    kvfree(af_desc);
>> +
>> +    return irq;
>>   }
>>   static struct mlx5_irq_pool *
>