From nobody Sat Feb 7 08:28:14 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72730140E29 for ; Mon, 8 Apr 2024 15:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590208; cv=none; b=PaPt+iOTX5jScWlnPFGbl+9yw281N2Y0xwgmUs9MnpQ0vXrsYE8AGE1CNzG3v9rytE52jGMVQptLG8Qm8IJXuBxL7glYxHO3NfpZ3Z9jYDybuhTZb2nlGfN/ZGfnAS5SNRCUwY5cxGSBXJvbmGmx87Nk/L6ISvONXHXyO8bfgCY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590208; c=relaxed/simple; bh=Smf4aywmigwysrSIcOcqw9bvaWWtvxCh+z00bSuHAcY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hrQut2OPBZM6RJlRFVADZarnYUPdAdLQtKwiIb5ms1eDsDqYXb1QjpJhL7otg5esbvtBY4rq6rvEj3feslCQTuksXwyT8oitLE1RXugRlWqVy3B67xvTKhQyLzpOoZNs+lKMfpdB3/dLdSVYgTNT1JAcY/aD0gf1RmXgkEoiuUw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DTY9sboM; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DTY9sboM" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-617fffab703so20542447b3.0 for ; Mon, 08 Apr 2024 08:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712590205; x=1713195005; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5ASL93255NaCWCo+CYsAiAClfDvlTbN+MqYwKv6ZLMw=; b=DTY9sboMOAOcwqlrn3sZHNftQ2BkhbFHzYAvsZNA/gLR7+w4BOI1usMRk2TOG3vLDT WMFLaxI6BX+4faSeTIDZ85Cdo+yQRjh2qKCGyjXbU/LQSMWaMAFdn+VjUB2/9J+8ml4P yAlAZSxHDbvFukxxhi/MmGf5JBYIVixyvVB+S1TvFJHQBtt7dkK2kId6bbwQGsl2TOsM TYC1qoTbIzjL1kLz2KFjP/kyLGRKi5byYkUMrvNt4LFWakFGD4yxYlCBYsYyUb0mqxSB FvDHv3Ktug+l3RMjq2y2GBwG0xrFbhEpGnEeQlqnBqJnBrkhX6LHLoOKNrQWxYxfe3Lz 3jXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712590205; x=1713195005; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5ASL93255NaCWCo+CYsAiAClfDvlTbN+MqYwKv6ZLMw=; b=ITaX0hB/IeXbULZz32GV1QUfjaP7tk4r4mzz3+SBThs34uhWtxxt33TzKQ0kE2EWf0 Vmbm827Krfa5fp17IYjF8qEVkC8gAuFZj0bae9NgHRKl3WkJR+k2n+2cSwr5PzmYGg+u W11KDTMU/52K54ltOlChtx+Eohjg4YH8p+bZGNVT6mKupbHxZtEMOt68pWxE2UPM0qsp OnB9l3BrHuoI52bqedtOMJQI6X9L+m/RXVmZe/b6QYD9ri3Dyfdn0cQ/79F116yHZM2j DsF5cwTTRS0GlJf7f6GIqQE7lf8pAx7yts46A9oLGWcvoVQWwJXpFTXuub4EHHMftir/ wSuQ== X-Forwarded-Encrypted: i=1; AJvYcCXIp4JXmOd79jlA8R2SJuQ6El/z0ONl5d6sYdpwEmLPYAueNkoRBlP2nr+GhcDNkhMNVntgMvN8nISMUG7j2/ZfM3Xr7oZ+Z++UnUTq X-Gm-Message-State: AOJu0Ywhqc/AySo4xUfhSOrYU/TUdgsP/ymaanIfN+AwdaQz78Jokoy5 lPmgd5jq7carG9Zc27z43/K9prYMCpxo4oxAP+LpT5IF6B6gZwfQAjmQwLkLSPtkkkeZsgRDZ+Q K4SM+bS/RrSAy5MH7zWFDyw== X-Google-Smtp-Source: AGHT+IHXvDrx0RfrpDfk+CeWB/a5GDfltDvqCr1L7MJCzD0FqFc/C0bRoo7LD/8GYLg36JJS/efD6eFuQ7KRgW6Ebw== X-Received: from almasrymina.svl.corp.google.com ([2620:15c:2c4:200:ca23:d62d:de32:7c93]) (user=almasrymina job=sendgmr) by 2002:a05:6902:1108:b0:dc7:865b:22c6 with SMTP id o8-20020a056902110800b00dc7865b22c6mr721592ybu.8.1712590205499; Mon, 08 Apr 2024 08:30:05 -0700 (PDT) Date: Mon, 8 Apr 2024 08:29:56 -0700 In-Reply-To: <20240408153000.2152844-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240408153000.2152844-1-almasrymina@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240408153000.2152844-2-almasrymina@google.com> Subject: [PATCH net-next v5 1/3] net: make napi_frag_unref reuse skb_page_unref From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mina Almasry , Ayush Sawal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jesper Dangaard Brouer , Ilias Apalodimas , Steffen Klassert , Herbert Xu , David Ahern , Boris Pismenny , John Fastabend , Dragos Tatulea Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Eric Dumazet Reviewed-by: Jacob Keller --- include/linux/skbuff.h | 12 +++--------- net/ipv4/esp4.c | 2 +- net/ipv6/esp6.c | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7dfb906d92f7..c0ff85bb087a 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3522,10 +3522,10 @@ int skb_cow_data_for_xdp(struct page_pool *pool, st= ruct sk_buff **pskb, bool napi_pp_put_page(struct page *page); =20 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 pag= e *page) static inline void napi_frag_unref(skb_frag_t *frag, bool recycle) { - struct page *page =3D 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); } =20 /** diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 3d647c9a7a21..40330253f076 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -114,7 +114,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *t= mp, struct sk_buff *skb) */ if (req->src !=3D req->dst) for (sg =3D sg_next(req->src); sg; sg =3D sg_next(sg)) - skb_page_unref(skb, sg_page(sg)); + skb_page_unref(sg_page(sg), skb->pp_recycle); } =20 #ifdef CONFIG_INET_ESPINTCP diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index fe8d53f5a5ee..fb431d0a3475 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -131,7 +131,7 @@ static void esp_ssg_unref(struct xfrm_state *x, void *t= mp, struct sk_buff *skb) */ if (req->src !=3D req->dst) for (sg =3D sg_next(req->src); sg; sg =3D sg_next(sg)) - skb_page_unref(skb, sg_page(sg)); + skb_page_unref(sg_page(sg), skb->pp_recycle); } =20 #ifdef CONFIG_INET6_ESPINTCP --=20 2.44.0.478.gd926399ef9-goog From nobody Sat Feb 7 08:28:14 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83BF31411CA for ; Mon, 8 Apr 2024 15:30:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590210; cv=none; b=tlUKw8VQozzbVGKWzGADQ8qmHouzZKbedGKY5DpUfHIplgcU6Cmr//Xr6nJh0Bid/nHnBColejmqA17uI7LrKXIjp9qTG6VqkPgqsirx42hKChRd3iCj+OmGX9a8+OQMrgpQj0dtX73MIKrIE7SiUFccS90HoUBAO4cUB51IW9o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590210; c=relaxed/simple; bh=Vpb1x8zaaYpZppjsaSUsvF+Hn0EXztb3KJga9Q7tto0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u24oh+ssUdHSgGXYuDLJY6qFMddQguvqcaaBzfPVSV+4BcaBg3YzhiczhwCKDfqEecBqHjoTs4QXIEi2hqabJrewx05TdfVfbb2txTWzFhUaaKeTtPKNrHRCAtbFgp+hsGxjQ4bXlnWYJyvVtO1WPJ7YhaA+Xl0dk0VfcWa4WnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=p734RBnb; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="p734RBnb" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dd0ae66422fso8905234276.0 for ; Mon, 08 Apr 2024 08:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712590207; x=1713195007; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=gWR8tijWyRj2FfKuG2Rt//np5l0aZNm00N8W4mX854s=; b=p734RBnbK1MaFKSMLkT2+JD5NOAxhqCPrgSkec62y+6c2i1is7KyDhQrh9NgbSWpHe Dqc+Gb4hpimi9O4MvksuV0zfkpzaHuuJSRcB8mSMvaDCJCscApbOb9dfMl7mOJBLVZ7m k3wizG01hS/3pejsIlb7E6qRC/m6FZD9nsSkxeJrwmrHGq8dENLDLShufCzC5Dy4vdyq m0JGUU/YvJaoL0XwQz6QwLYafNnd082KreM2naUIKFGWHPf/fsmLCSbkLdB0xDKJYw4K 70O14GhlVmcen+kkQL2q2alv0KRuf0d9aK7xwuI0JrRq48t0m4iNOxrmtd5jKSqAGqb6 nypw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712590207; x=1713195007; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gWR8tijWyRj2FfKuG2Rt//np5l0aZNm00N8W4mX854s=; b=K+M6WT1zALE6efGd5L0tB9s3w+QuGzjoL/rWk52BXNmFJVX0Mwbai4YEyRH8Ve/PK/ 6VEPliUBD8J2/c1O6+FtLUTcBXrPxxYBiKTI+E0bX9fte4ZiGfDbC4HmCUM3yv7mXvG2 9sZDhHNZdvDSjDmJ1Eo3xJ2rDk/FuCgRK2uimjHS43vxYa6QWGbjQ7KXVtjZHTkqVdLF 2sx8u5LaEsJJ6HgR5lfqiet+d8tSKpyNZUync5PQxj8vayEglbYsEJOUCHOIXIIme7S/ FQLOl213bwakPl9Ad8X0srVNkYnooUWz9IJ2k12dhUuaFzdn6354mLRdzSigukiGk5Db /rIg== X-Forwarded-Encrypted: i=1; AJvYcCVq28DbcytbyOKLmsnTJ1t+m6hgwdIJoVlf6lFMDIsGU9zuqp1UVWiANfm5yEQT5IrKd5VgVZCHMEOEUl0xUQN7k6jxeKWKvQpTHAvx X-Gm-Message-State: AOJu0YxnNQirKaDDjjxrlSeF7AUZB8YQbnAip3TAgYNcvom+WdCW9/2M SKhuX4a6bPNAlvjBNpmsxM4vN68T55EXQtoqSZ0IwXv7zpLQnLI+4RLsZlWC34P9wDwNNeY9W+G vxfHWdabTUF6BHDtJeYcLDA== X-Google-Smtp-Source: AGHT+IE6FoKwTKXpzfONClpxQYuW9N9Gxa8U8wuX//GM6Bov75pxNsHsLhjCO7DRpMzB4WraVxS0nAPMPubHq4MKZg== X-Received: from almasrymina.svl.corp.google.com ([2620:15c:2c4:200:ca23:d62d:de32:7c93]) (user=almasrymina job=sendgmr) by 2002:a05:6902:72e:b0:dc6:e884:2342 with SMTP id l14-20020a056902072e00b00dc6e8842342mr3475222ybt.5.1712590207525; Mon, 08 Apr 2024 08:30:07 -0700 (PDT) Date: Mon, 8 Apr 2024 08:29:57 -0700 In-Reply-To: <20240408153000.2152844-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240408153000.2152844-1-almasrymina@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240408153000.2152844-3-almasrymina@google.com> Subject: [PATCH net-next v5 2/3] net: mirror skb frag ref/unref helpers From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mina Almasry , Ayush Sawal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jesper Dangaard Brouer , Ilias Apalodimas , Steffen Klassert , Herbert Xu , David Ahern , Boris Pismenny , John Fastabend , Dragos Tatulea Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor some of the skb frag ref/unref helpers for improved clarity. Implement napi_pp_get_page() to be the mirror counterpart of napi_pp_put_page(). Implement skb_page_ref() to be the mirror of skb_page_unref(). Improve __skb_frag_ref() to become a mirror counterpart of __skb_frag_unref(). Previously unref could handle pp & non-pp pages, while the ref could only handle non-pp pages. Now both the ref & unref helpers can correctly handle both pp & non-pp pages. Now that __skb_frag_ref() can handle both pp & non-pp pages, remove skb_pp_frag_ref(), and use __skb_frag_ref() instead. This lets us remove pp specific handling from skb_try_coalesce. Additionally, since __skb_frag_ref() can now handle both pp & non-pp pages, a latent issue in skb_shift() should now be fixed. Previously this function would do a non-pp ref & pp unref on potential pp frags (fragfrom). After this patch, skb_shift() should correctly do a pp ref/unref on pp frags. Signed-off-by: Mina Almasry Reviewed-by: Dragos Tatulea Reviewed-by: Jacob Keller --- v5: - Made changes to inline napi_pp_get_page() (Eric). I had to move page_pool_ref_page() from include/net/page_pool/helpers.h to include/linux/skbuff.h, so I don't add more includes to skbuff.h, which slows down the incremental builds. v4: - pass skb->pp_recycle instead of 'false' in __skb_frag_ref in chcr_ktls.c & cassini.c. - Add some details on the changes to skb_shift() in this commit in the commit message. v3: - Fix build errors reported by patchwork. - Fix drivers/net/veth.c & tls_device_fallback.c callsite I missed to updat= e. - Fix page_pool_ref_page(head_page) -> page_pool_ref_page(page) --- .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 2 +- drivers/net/ethernet/sun/cassini.c | 4 +- drivers/net/veth.c | 2 +- include/linux/skbuff.h | 44 ++++++++++++++++-- include/net/page_pool/helpers.h | 5 -- net/core/skbuff.c | 46 ++----------------- net/tls/tls_device_fallback.c | 2 +- 7 files changed, 49 insertions(+), 56 deletions(-) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c= b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c index 6482728794dd..d7e8deafddf1 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c @@ -1658,7 +1658,7 @@ static void chcr_ktls_copy_record_in_skb(struct sk_bu= ff *nskb, for (i =3D 0; i < record->num_frags; i++) { skb_shinfo(nskb)->frags[i] =3D record->frags[i]; /* increase the frag ref count */ - __skb_frag_ref(&skb_shinfo(nskb)->frags[i]); + __skb_frag_ref(&skb_shinfo(nskb)->frags[i], nskb->pp_recycle); } =20 skb_shinfo(nskb)->nr_frags =3D record->num_frags; diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/= cassini.c index bfb903506367..31878256feee 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -1999,7 +1999,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct = cas_rx_comp *rxc, skb->len +=3D hlen - swivel; =20 skb_frag_fill_page_desc(frag, page->buffer, off, hlen - swivel); - __skb_frag_ref(frag); + __skb_frag_ref(frag, skb->pp_recycle); =20 /* any more data? */ if ((words[0] & RX_COMP1_SPLIT_PKT) && ((dlen -=3D hlen) > 0)) { @@ -2023,7 +2023,7 @@ static int cas_rx_process_pkt(struct cas *cp, struct = cas_rx_comp *rxc, frag++; =20 skb_frag_fill_page_desc(frag, page->buffer, 0, hlen); - __skb_frag_ref(frag); + __skb_frag_ref(frag, skb->pp_recycle); RX_USED_ADD(page, hlen + cp->crc_size); } =20 diff --git a/drivers/net/veth.c b/drivers/net/veth.c index bcdfbf61eb66..6160a3e8d341 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -716,7 +716,7 @@ static void veth_xdp_get(struct xdp_buff *xdp) return; =20 for (i =3D 0; i < sinfo->nr_frags; i++) - __skb_frag_ref(&sinfo->frags[i]); + __skb_frag_ref(&sinfo->frags[i], false); } =20 static int veth_convert_skb_to_xdp_buff(struct veth_rq *rq, diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index c0ff85bb087a..2e6a77c398e6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3492,15 +3492,51 @@ static inline struct page *skb_frag_page(const skb_= frag_t *frag) return netmem_to_page(frag->netmem); } =20 +#ifdef CONFIG_PAGE_POOL +static inline bool is_pp_page(struct page *page) +{ + return (page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE; +} + +/* page_pool_unref_page() lives in net/page_pool/helpers.h */ +static inline void page_pool_ref_page(struct page *page) +{ + atomic_long_inc(&page->pp_ref_count); +} + +static inline bool napi_pp_get_page(struct page *page) +{ + page =3D compound_head(page); + + if (!is_pp_page(page)) + return false; + + page_pool_ref_page(page); + return true; +} +#endif + +static inline void skb_page_ref(struct page *page, bool recycle) +{ +#ifdef CONFIG_PAGE_POOL + if (recycle && napi_pp_get_page(page)) + return; +#endif + get_page(page); +} + /** * __skb_frag_ref - take an addition reference on a paged fragment. * @frag: the paged fragment + * @recycle: skb->pp_recycle param of the parent skb. False if no parent s= kb. * - * Takes an additional reference on the paged fragment @frag. + * Takes an additional reference on the paged fragment @frag. Obtains the + * correct reference count depending on whether skb->pp_recycle is set and + * whether the frag is a page pool frag. */ -static inline void __skb_frag_ref(skb_frag_t *frag) +static inline void __skb_frag_ref(skb_frag_t *frag, bool recycle) { - get_page(skb_frag_page(frag)); + skb_page_ref(skb_frag_page(frag), recycle); } =20 /** @@ -3512,7 +3548,7 @@ static inline void __skb_frag_ref(skb_frag_t *frag) */ static inline void skb_frag_ref(struct sk_buff *skb, int f) { - __skb_frag_ref(&skb_shinfo(skb)->frags[f]); + __skb_frag_ref(&skb_shinfo(skb)->frags[f], skb->pp_recycle); } =20 int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb, diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helper= s.h index 1d397c1a0043..ead2c0d24b2c 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -277,11 +277,6 @@ static inline long page_pool_unref_page(struct page *p= age, long nr) return ret; } =20 -static inline void page_pool_ref_page(struct page *page) -{ - atomic_long_inc(&page->pp_ref_count); -} - static inline bool page_pool_is_last_ref(struct page *page) { /* If page_pool_unref_page() returns 0, we were the last user */ diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 21cd01641f4c..928c615b0fd8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -906,11 +906,6 @@ static void skb_clone_fraglist(struct sk_buff *skb) skb_get(list); } =20 -static bool is_pp_page(struct page *page) -{ - return (page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE; -} - int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb, unsigned int headroom) { @@ -1032,37 +1027,6 @@ static bool skb_pp_recycle(struct sk_buff *skb, void= *data) return napi_pp_put_page(virt_to_page(data)); } =20 -/** - * skb_pp_frag_ref() - Increase fragment references of a page pool aware s= kb - * @skb: page pool aware skb - * - * Increase the fragment reference count (pp_ref_count) of a skb. This is - * intended to gain fragment references only for page pool aware skbs, - * i.e. when skb->pp_recycle is true, and not for fragments in a - * non-pp-recycling skb. It has a fallback to increase references on normal - * pages, as page pool aware skbs may also have normal page fragments. - */ -static int skb_pp_frag_ref(struct sk_buff *skb) -{ - struct skb_shared_info *shinfo; - struct page *head_page; - int i; - - if (!skb->pp_recycle) - return -EINVAL; - - shinfo =3D skb_shinfo(skb); - - for (i =3D 0; i < shinfo->nr_frags; i++) { - head_page =3D compound_head(skb_frag_page(&shinfo->frags[i])); - if (likely(is_pp_page(head_page))) - page_pool_ref_page(head_page); - else - page_ref_inc(head_page); - } - return 0; -} - static void skb_kfree_head(void *head, unsigned int end_offset) { if (end_offset =3D=3D SKB_SMALL_HEAD_HEADROOM) @@ -4175,7 +4139,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *sk= b, int shiftlen) to++; =20 } else { - __skb_frag_ref(fragfrom); + __skb_frag_ref(fragfrom, skb->pp_recycle); skb_frag_page_copy(fragto, fragfrom); skb_frag_off_copy(fragto, fragfrom); skb_frag_size_set(fragto, todo); @@ -4825,7 +4789,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, } =20 *nskb_frag =3D (i < 0) ? skb_head_frag_to_page_desc(frag_skb) : *frag; - __skb_frag_ref(nskb_frag); + __skb_frag_ref(nskb_frag, nskb->pp_recycle); size =3D skb_frag_size(nskb_frag); =20 if (pos < offset) { @@ -5956,10 +5920,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_= buff *from, /* if the skb is not cloned this does nothing * since we set nr_frags to 0. */ - if (skb_pp_frag_ref(from)) { - for (i =3D 0; i < from_shinfo->nr_frags; i++) - __skb_frag_ref(&from_shinfo->frags[i]); - } + for (i =3D 0; i < from_shinfo->nr_frags; i++) + __skb_frag_ref(&from_shinfo->frags[i], from->pp_recycle); =20 to->truesize +=3D delta; to->len +=3D len; diff --git a/net/tls/tls_device_fallback.c b/net/tls/tls_device_fallback.c index 4e7228f275fa..d4000b4a1f7d 100644 --- a/net/tls/tls_device_fallback.c +++ b/net/tls/tls_device_fallback.c @@ -277,7 +277,7 @@ static int fill_sg_in(struct scatterlist *sg_in, for (i =3D 0; remaining > 0; i++) { skb_frag_t *frag =3D &record->frags[i]; =20 - __skb_frag_ref(frag); + __skb_frag_ref(frag, false); sg_set_page(sg_in + i, skb_frag_page(frag), skb_frag_size(frag), skb_frag_off(frag)); =20 --=20 2.44.0.478.gd926399ef9-goog From nobody Sat Feb 7 08:28:14 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6F231420C6 for ; Mon, 8 Apr 2024 15:30:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590212; cv=none; b=Y0MZHKjRL554Finp7cgAHQ1bsQl1X/6UTTuyIqJKxWHWFLIUsYIXJqIerM+HkpB1g+BUe5ETm2sFJC7fS+3lQrykUU4WMuIbDRJn6reftzfL1v3C8dTolDRTH8mAc3leUxVCAF2n+ZoPEJKkjmrj3chUtTTWocw5MiVoZVA6Dd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712590212; c=relaxed/simple; bh=NDYzyHSUEz+bbz7ZtE+Jug/pzyRM5rfU190IW5ZReg8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pNiQs0kpE21tw9y7DXU7AG8iZZAJKD7jsgCwBnFD86ghiG4sXvI3KQEbkm5okEMbFAvm+zlay20wd4TabJhBmwXZzBZL44sbrHpg+9EwtIhQ3esHWUo7kgiKIVawT5mFO4XngCn5gQ/oYqXfZATdDkM8vtrJ9BJE74uka1y0aO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=fflNLI5C; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fflNLI5C" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6b26783b4so5224590276.0 for ; Mon, 08 Apr 2024 08:30:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712590209; x=1713195009; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Xm7z+KL73iPrkFgDvs1nsRXYHlgtAjFxvC1NZB/hNSc=; b=fflNLI5CgIlqo6YvU8JEfwzK6EwJNZEfZO0XkdcTGKoxDeRWEXyDbZwMSDxHxiEp6D Zalx0Zmx6iFCB07qxft0FHfiglTtKN/MyBVFCLqdBu6/YYDXA/+ObNEzfYp9dybWodyz tWxeDEZu9wGH1sAxw0C+DJlUulBnngiQS3ibH5v7vRrEiwz1iHehVilTHh9JsH5jbKv8 W19NDcuULqCjhXRr7R364Lb1gcYfBx8y4tgB3qDZMg4j2fWjIUe/4gS3WfJNU8fw8zTI 5shsoFsCbjMHQ5cYtZZdRur7UBVzB/VkUTI5bUdAxXwguha+RGhelHD43BTCe5n7BSex j0Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712590209; x=1713195009; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Xm7z+KL73iPrkFgDvs1nsRXYHlgtAjFxvC1NZB/hNSc=; b=dnzLYiZ/7gTm9fZkc1NNdUiUH4t+AOCxas1+Q3hM4sHuJEl4tjERNgLIO5YsRI0a1r o4x+NRCuhJakmObKXp0b17QC8vz7E+qSmpYBEv3R6n1XiKyl69WbZWgLMrEuDUAdFPqg gVkgi/xPVaG80pOIucl80aVCnmaZW6ocjW0FVW9QQEDGdXRB1djYgE7PIhHx2HMYWtUt /rKJ+FuHO9quxPgvIGEj+TbPyU3Bv+l3XInPKtKdFcx93TLIH7pAWHz3K0QD3RuKGW0s Dq6Crzwzr5650E9VH42e+K11iNZL/l20jcCNx0hLKsfLk7WzhRAZBORmjFXHHgSBJJC6 0omw== X-Forwarded-Encrypted: i=1; AJvYcCXY6HUSWwbIy9dc3DYv5FDsR+DR1lrWUtLmuYQprQwZoCXwJQXKbZ6PqzcQE5A5h7tGde58dPahOaY4HBdyfQiN2yN/lcYTpCsAwgyJ X-Gm-Message-State: AOJu0Ywzu21yY3FGhFEigGlpqaeSNZ4Rsju6Gv8tCqxkb34dgoCvYPOx WCsCQJiPPaIHMDzx1PvwrytNzPWKtJezdDyNCgaKxHUcypjMdcJt5jMUMbgqNdoDTN8iTnSUD/B 7Bs0P35SDXmV6JtmvoDShag== X-Google-Smtp-Source: AGHT+IHEL0+TarXvLMGMrfBR4gZxn2J1EmL7QHPTCXuCCsv9uL1aBkHapD0+r2rKvIYCP/4rgQxRmAFLB1Eep03fqg== X-Received: from almasrymina.svl.corp.google.com ([2620:15c:2c4:200:ca23:d62d:de32:7c93]) (user=almasrymina job=sendgmr) by 2002:a05:6902:18c8:b0:dcd:59a5:7545 with SMTP id ck8-20020a05690218c800b00dcd59a57545mr683253ybb.10.1712590209659; Mon, 08 Apr 2024 08:30:09 -0700 (PDT) Date: Mon, 8 Apr 2024 08:29:58 -0700 In-Reply-To: <20240408153000.2152844-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240408153000.2152844-1-almasrymina@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240408153000.2152844-4-almasrymina@google.com> Subject: [PATCH net-next v5 3/3] net: remove napi_frag_unref From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mina Almasry , Ayush Sawal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jesper Dangaard Brouer , Ilias Apalodimas , Steffen Klassert , Herbert Xu , David Ahern , Boris Pismenny , John Fastabend , Dragos Tatulea Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With the changes in the last patches, napi_frag_unref() is now reduandant. Remove it and use skb_page_unref directly. Signed-off-by: Mina Almasry Reviewed-by: Dragos Tatulea Reviewed-by: Eric Dumazet Reviewed-by: Jacob Keller --- include/linux/skbuff.h | 8 +------- net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2e6a77c398e6..182371f4834d 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -3567,12 +3567,6 @@ skb_page_unref(struct page *page, bool recycle) put_page(page); } =20 -static inline void -napi_frag_unref(skb_frag_t *frag, bool recycle) -{ - skb_page_unref(skb_frag_page(frag), recycle); -} - /** * __skb_frag_unref - release a reference on a paged fragment. * @frag: the paged fragment @@ -3583,7 +3577,7 @@ napi_frag_unref(skb_frag_t *frag, bool recycle) */ static inline void __skb_frag_unref(skb_frag_t *frag, bool recycle) { - napi_frag_unref(frag, recycle); + skb_page_unref(skb_frag_page(frag), recycle); } =20 /** diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 928c615b0fd8..38c20b44cb14 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1065,7 +1065,7 @@ static void skb_release_data(struct sk_buff *skb, enu= m skb_drop_reason reason) } =20 for (i =3D 0; i < shinfo->nr_frags; i++) - napi_frag_unref(&shinfo->frags[i], skb->pp_recycle); + __skb_frag_unref(&shinfo->frags[i], skb->pp_recycle); =20 free_head: if (shinfo->frag_list) --=20 2.44.0.478.gd926399ef9-goog