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: 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>

diff --git a/net/core/xdp.c b/net/core/xdp.c
index 89111c68e5450e2608e9470cee489011c380f783..4e91c779067112fd6dc6856f9401c644a9ca697d 100644 (file)
--- a/net/core/xdp.c
+++ b/net/core/xdp.c
@@ -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,