Commit 7ead4405 authored by Bui Quang Minh's avatar Bui Quang Minh Committed by Jakub Kicinski
Browse files

xsk: convert xdp_copy_frags_from_zc() to use page_pool_dev_alloc() 



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: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarBui Quang Minh <minhquangbui99@gmail.com>
Link: https://patch.msgid.link/20250426081220.40689-3-minhquangbui99@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ebaebc5e

net/core/xdp.c

+7 −7
Original line number Diff line number Diff line
@@ -701,21 +701,21 @@ static noinline bool xdp_copy_frags_from_zc(struct sk_buff *skb, 
		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) + offset,

		       __netmem_address(frag->netmem) + skb_frag_off(frag),

		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,