netdev - Re: [PATCH net-next 10/20] xsk: Move pool registration into single function

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <15740fe5-65bf-46fa-adbd-a87eb703d6b4@iogearbox.net>
Date: Mon, 22 Sep 2025 18:15:04 +0200
From: Daniel Borkmann <daniel@...earbox.net>
To: Maciej Fijalkowski <maciej.fijalkowski@...el.com>
Cc: netdev@...r.kernel.org, bpf@...r.kernel.org, kuba@...nel.org,
 davem@...emloft.net, razor@...ckwall.org, pabeni@...hat.com,
 willemb@...gle.com, sdf@...ichev.me, john.fastabend@...il.com,
 martin.lau@...nel.org, jordan@...fe.io, magnus.karlsson@...el.com,
 David Wei <dw@...idwei.uk>
Subject: Re: [PATCH net-next 10/20] xsk: Move pool registration into single
 function

On 9/22/25 6:01 PM, Maciej Fijalkowski wrote:
> On Fri, Sep 19, 2025 at 11:31:43PM +0200, Daniel Borkmann wrote:
>> Small refactor to move the pool registration into xsk_reg_pool_at_qid,
>> such that the netdev and queue_id can be registered there. No change
>> in functionality.
>>
>> Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
>> Co-developed-by: David Wei <dw@...idwei.uk>
>> Signed-off-by: David Wei <dw@...idwei.uk>
>> ---
>>   net/xdp/xsk.c           |  5 +++++
>>   net/xdp/xsk_buff_pool.c | 16 +++-------------
>>   2 files changed, 8 insertions(+), 13 deletions(-)
>>
>> diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
>> index 72e34bd2d925..82ad89f6ba35 100644
>> --- a/net/xdp/xsk.c
>> +++ b/net/xdp/xsk.c
>> @@ -141,6 +141,11 @@ int xsk_reg_pool_at_qid(struct net_device *dev, struct xsk_buff_pool *pool,
>>   			      dev->real_num_rx_queues,
>>   			      dev->real_num_tx_queues))
>>   		return -EINVAL;
>> +	if (xsk_get_pool_from_qid(dev, queue_id))
>> +		return -EBUSY;
>> +
>> +	pool->netdev = dev;
>> +	pool->queue_id = queue_id;
>>   
>>   	if (queue_id < dev->real_num_rx_queues)
>>   		dev->_rx[queue_id].pool = pool;
>> diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
>> index 26165baf99f4..375696f895d4 100644
>> --- a/net/xdp/xsk_buff_pool.c
>> +++ b/net/xdp/xsk_buff_pool.c
>> @@ -169,32 +169,24 @@ int xp_assign_dev(struct xsk_buff_pool *pool,
>>   
>>   	force_zc = flags & XDP_ZEROCOPY;
>>   	force_copy = flags & XDP_COPY;
>> -
>>   	if (force_zc && force_copy)
>>   		return -EINVAL;
>>   
>> -	if (xsk_get_pool_from_qid(netdev, queue_id))
>> -		return -EBUSY;
>> -
>> -	pool->netdev = netdev;
>> -	pool->queue_id = queue_id;
>>   	err = xsk_reg_pool_at_qid(netdev, pool, queue_id);
>>   	if (err)
>>   		return err;
>>   
>>   	if (flags & XDP_USE_SG)
>>   		pool->umem->flags |= XDP_UMEM_SG_FLAG;
>> -
> 
> IMHO all of the stuff below looks like unnecessary code churn.
Ack, will drop it in v2, thx!