superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netmem, devmem, tcp: access pp fields through @desc in net_iov 

Convert all the legacy code directly accessing the pp fields in net_iov
to access them through @desc in net_iov.

Signed-off-by: Byungchul Park <byungchul@sk.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
pull/1354/merge
Byungchul Park 2025-11-26 13:36:46 +09:00 committed by Jakub Kicinski
parent db4029859d
commit df59bb5b9a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/skbuff.h
View File

@ -3778,8 +3778,8 @@ static inline dma_addr_t __skb_frag_dma_map(struct device *dev,
enum dma_data_direction dir) enum dma_data_direction dir)
{ {
if (skb_frag_is_net_iov(frag)) { if (skb_frag_is_net_iov(frag)) {
return netmem_to_net_iov(frag->netmem)->dma_addr + offset + return netmem_to_net_iov(frag->netmem)->desc.dma_addr +
frag->offset; offset + frag->offset;
} }
return dma_map_page(dev, skb_frag_page(frag), return dma_map_page(dev, skb_frag_page(frag),
skb_frag_off(frag) + offset, size, dir); skb_frag_off(frag) + offset, size, dir);

6
net/core/devmem.c
View File

@ -97,9 +97,9 @@ net_devmem_alloc_dmabuf(struct net_devmem_dmabuf_binding *binding)
index = offset / PAGE_SIZE; index = offset / PAGE_SIZE;
niov = &owner->area.niovs[index]; niov = &owner->area.niovs[index];
niov->pp_magic = 0; niov->desc.pp_magic = 0;
niov->pp = NULL; niov->desc.pp = NULL;
atomic_long_set(&niov->pp_ref_count, 0); atomic_long_set(&niov->desc.pp_ref_count, 0);
return niov; return niov;
} }

2
net/ipv4/tcp.c
View File

@ -2587,7 +2587,7 @@ static int tcp_recvmsg_dmabuf(struct sock *sk, const struct sk_buff *skb,
if (err) if (err)
goto out; goto out;
atomic_long_inc(&niov->pp_ref_count); atomic_long_inc(&niov->desc.pp_ref_count);
tcp_xa_pool.netmems[tcp_xa_pool.idx++] = skb_frag_netmem(frag); tcp_xa_pool.netmems[tcp_xa_pool.idx++] = skb_frag_netmem(frag);
sent += copy; sent += copy;