net: make napi_frag_unref reuse skb_page_unref

The implementations of these 2 functions are almost identical. Remove
the implementation of napi_frag_unref, and make it a call into
skb_page_unref so we don't duplicate the implementation.

Signed-off-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240408153000.2152844-2-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7dfb906d92f718319cac736421705b21bd09debe..c0ff85bb087ad0dd317f4e6079fc7937c1afbf9c 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3522,10 +3522,10 @@ int skb_cow_data_for_xdp(struct page_pool *pool, struct sk_buff **pskb,
 bool napi_pp_put_page(struct page *page);
 
 static inline void
-skb_page_unref(const struct sk_buff *skb, struct page *page)
+skb_page_unref(struct page *page, bool recycle)
 {
 #ifdef CONFIG_PAGE_POOL
-       if (skb->pp_recycle && napi_pp_put_page(page))
+       if (recycle && napi_pp_put_page(page))
                return;
 #endif
        put_page(page);
@@ -3534,13 +3534,7 @@ skb_page_unref(const struct sk_buff *skb, struct page *page)
 static inline void
 napi_frag_unref(skb_frag_t *frag, bool recycle)
 {
-       struct page *page = skb_frag_page(frag);
-
-#ifdef CONFIG_PAGE_POOL
-       if (recycle && napi_pp_put_page(page))
-               return;
-#endif
-       put_page(page);
+       skb_page_unref(skb_frag_page(frag), recycle);
 }
 
 /**

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 3d647c9a7a21e7301e1193f165599f19e8e0bc9d..40330253f07665e5d54e1566f603962f64eaff73 100644 (file)
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -114,7 +114,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)
         */
        if (req->src != req->dst)
                for (sg = sg_next(req->src); sg; sg = sg_next(sg))
-                       skb_page_unref(skb, sg_page(sg));
+                       skb_page_unref(sg_page(sg), skb->pp_recycle);
 }
 
 #ifdef CONFIG_INET_ESPINTCP

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index fe8d53f5a5eecb6bdae87348b6b8f5fb27b23ac7..fb431d0a347545183864b901cd6403afcf07fed7 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -131,7 +131,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp, struct sk_buff *skb)
         */
        if (req->src != req->dst)
                for (sg = sg_next(req->src); sg; sg = sg_next(sg))
-                       skb_page_unref(skb, sg_page(sg));
+                       skb_page_unref(sg_page(sg), skb->pp_recycle);
 }
 
 #ifdef CONFIG_INET6_ESPINTCP