From nobody Wed Dec 31 02:35:39 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66BF9C4332F for ; Mon, 13 Nov 2023 13:00:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231213AbjKMNAz (ORCPT ); Mon, 13 Nov 2023 08:00:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbjKMNAn (ORCPT ); Mon, 13 Nov 2023 08:00:43 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3726519A7; Mon, 13 Nov 2023 05:00:39 -0800 (PST) Received: from dggpemm500005.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4STTvY6l89zPnY6; Mon, 13 Nov 2023 20:56:25 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpemm500005.china.huawei.com (7.185.36.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Mon, 13 Nov 2023 21:00:37 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Eric Dumazet Subject: [PATCH RFC 5/8] skbuff: remove compound_head() related function calling Date: Mon, 13 Nov 2023 21:00:37 +0800 Message-ID: <20231113130041.58124-6-linyunsheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20231113130041.58124-1-linyunsheng@huawei.com> References: <20231113130041.58124-1-linyunsheng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500005.china.huawei.com (7.185.36.74) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As we have ensured that the page for the skb frag is always a base page or head page for a compound page, we can remove some compound_head() related function. Signed-off-by: Yunsheng Lin --- include/linux/skbuff.h | 8 +++++--- net/core/skbuff.c | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 3e2f806c8ed8..1889b0968be0 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2473,13 +2473,15 @@ static inline void skb_len_add(struct sk_buff *skb,= int delta) static inline void __skb_fill_page_desc(struct sk_buff *skb, int i, struct page *page, int off, int size) { - __skb_fill_page_desc_noacc(skb_shinfo(skb), i, page, off, size); + skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; + + skb_frag_fill_page_desc(frag, page, off, size); =20 /* Propagate page pfmemalloc to the skb if we can. The problem is * that not all callers have unique ownership of the page but rely * on page_is_pfmemalloc doing the right thing(tm). */ - page =3D compound_head(page); + page =3D frag->bv_page; if (page_is_pfmemalloc(page)) skb->pfmemalloc =3D true; } @@ -3429,7 +3431,7 @@ static inline struct page *skb_frag_page(const skb_fr= ag_t *frag) */ static inline void __skb_frag_ref(skb_frag_t *frag) { - get_page(skb_frag_page(frag)); + page_ref_inc(skb_frag_page(frag)); } =20 /** diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b157efea5dea..ada3da4fe221 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -896,8 +896,6 @@ bool napi_pp_put_page(struct page *page, bool napi_safe) bool allow_direct =3D false; struct page_pool *pp; =20 - page =3D compound_head(page); - /* page->pp_magic is OR'ed with PP_SIGNATURE after the allocation * in order to preserve any existing bits, such as bit 0 for the * head page of compound page and bit 1 for pfmemalloc page, so @@ -939,7 +937,7 @@ static bool skb_pp_recycle(struct sk_buff *skb, void *d= ata, bool napi_safe) { if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb->pp_recycle) return false; - return napi_pp_put_page(virt_to_page(data), napi_safe); + return napi_pp_put_page(virt_to_head_page(data), napi_safe); } =20 static void skb_kfree_head(void *head, unsigned int end_offset) --=20 2.33.0