diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-04-30 00:26:29 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-04-30 00:26:30 +0300 |
| commit | d899e4d55f78901597c0a1ae453166fce2718cb8 (patch) | |
| tree | 1f22454378401f70b5dcbfc5f1c78615ab9196d9 | |
| parent | eed848871c96d4b5a7b06307755b75abd0cc7a06 (diff) | |
| parent | 7ead4405e06f67bf2163fd4708a6ce0a495b1dca (diff) | |
| download | linux-d899e4d55f78901597c0a1ae453166fce2718cb8.tar.xz | |
Merge branch 'xsk-respect-the-offsets-when-copying-frags'
Bui Quang Minh says:
====================
xsk: respect the offsets when copying frags
In commit 560d958c6c68 ("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>
| -rw-r--r-- | net/core/xdp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/net/core/xdp.c b/net/core/xdp.c index ea819764ae39..4e91c7790671 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -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, |