public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

xsk: convert xdp_copy_frags_from_zc() to use page_pool_dev_alloc()

Browse source 
This commit makes xdp_copy_frags_from_zc() use page allocation API
page_pool_dev_alloc() instead of page_pool_dev_alloc_netmem() to avoid
possible confusion of the returned value.

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
Link: https://patch.msgid.link/20250426081220.40689-3-minhquangbui99@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Bui Quang Minh 2025-04-26 15:12:20 +07:00 • committed by Jakub Kicinski
parent ebaebc5eaf
commit 7ead4405e0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/core/xdp.c
View file

@ -701,21 +701,21 @@ static noinline bool xdp_copy_frags_from_zc(struct sk_buff *skb,
const skb_frag_t *frag = &xinfo->frags[i]; const skb_frag_t *frag = &xinfo->frags[i];
u32 len = skb_frag_size(frag); u32 len = skb_frag_size(frag);
u32 offset, truesize = len; u32 offset, truesize = len;
netmem_ref netmem; struct page *page;
netmem = page_pool_dev_alloc_netmem(pp, &offset, &truesize); page = page_pool_dev_alloc(pp, &offset, &truesize);
if (unlikely(!netmem)) { if (unlikely(!page)) {
sinfo->nr_frags = i; sinfo->nr_frags = i;
return false; return false;
} }
memcpy(__netmem_address(netmem) + offset, memcpy(page_address(page) + offset,
__netmem_address(frag->netmem) + skb_frag_off(frag), skb_frag_page(frag) + skb_frag_off(frag),
LARGEST_ALIGN(len)); LARGEST_ALIGN(len));
__skb_fill_netmem_desc_noacc(sinfo, i, netmem, offset, len); __skb_fill_page_desc_noacc(sinfo, i, page, offset, len);
tsize += truesize; tsize += truesize;
pfmemalloc |= netmem_is_pfmemalloc(netmem); pfmemalloc |= page_is_pfmemalloc(page);
} }
xdp_update_skb_shared_info(skb, nr_frags, xinfo->xdp_frags_size, xdp_update_skb_shared_info(skb, nr_frags, xinfo->xdp_frags_size,