mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 18:40:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xsk-respect-the-offsets-when-copying-frags'

Browse Source 
Bui Quang Minh says:

====================
xsk: respect the offsets when copying frags

In commit 560d958c6c ("xsk: add generic XSk &xdp_buff -> skb
conversion"), we introduce a helper to convert zerocopy xdp_buff to skb.
However, in the frag copy, we mistakenly ignore the frag's offset. This
series adds the missing offset when copying frags in
xdp_copy_frags_from_zc(). This function is not used anywhere so no
backport is needed.

This series also 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.
====================

Link: https://patch.msgid.link/20250426081220.40689-1-minhquangbui99@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-04-29 14:26:29 -07:00
parent eed848871c 7ead4405e0
commit d899e4d55f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/core/xdp.c
View File

@@ -698,23 +698,24 @@ static noinline bool xdp_copy_frags_from_zc(struct sk_buff *skb,
nr_frags = xinfo->nr_frags;
for (u32 i = 0; i < nr_frags; i++) {
u32 len = skb_frag_size(&xinfo->frags[i]);
const skb_frag_t *frag = &xinfo->frags[i];
u32 len = skb_frag_size(frag);
u32 offset, truesize = len;
netmem_ref netmem;
struct page *page;
netmem = page_pool_dev_alloc_netmem(pp, &offset, &truesize);
if (unlikely(!netmem)) {
page = page_pool_dev_alloc(pp, &offset, &truesize);
if (unlikely(!page)) {
sinfo->nr_frags = i;
return false;
}
memcpy(__netmem_address(netmem),
__netmem_address(xinfo->frags[i].netmem),
memcpy(page_address(page) + offset,
skb_frag_page(frag) + skb_frag_off(frag),
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;
pfmemalloc |= netmem_is_pfmemalloc(netmem);
pfmemalloc |= page_is_pfmemalloc(page);
}
xdp_update_skb_shared_info(skb, nr_frags, xinfo->xdp_frags_size,