Commit d899e4d5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Bui Quang Minh says:

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

In commit 560d958c ("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: default avatarJakub Kicinski <kuba@kernel.org>
parents eed84887 7ead4405

net/core/xdp.c

+9 −8
Original line number Diff line number Diff line
@@ -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,