lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20231113130041.58124-6-linyunsheng@huawei.com> Date: Mon, 13 Nov 2023 21:00:37 +0800 From: Yunsheng Lin <linyunsheng@...wei.com> To: <davem@...emloft.net>, <kuba@...nel.org>, <pabeni@...hat.com> CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, Yunsheng Lin <linyunsheng@...wei.com>, Eric Dumazet <edumazet@...gle.com> Subject: [PATCH RFC 5/8] skbuff: remove compound_head() related function calling 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 <linyunsheng@...wei.com> --- 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 = &skb_shinfo(skb)->frags[i]; + + skb_frag_fill_page_desc(frag, page, off, size); /* 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 = compound_head(page); + page = frag->bv_page; if (page_is_pfmemalloc(page)) skb->pfmemalloc = true; } @@ -3429,7 +3431,7 @@ static inline struct page *skb_frag_page(const skb_frag_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)); } /** 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 = false; struct page_pool *pp; - page = 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 *data, 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); } static void skb_kfree_head(void *head, unsigned int end_offset) -- 2.33.0
Powered by blists - more mailing lists