[PATCH net-next v2 2/3] pool_pool: avoid calling compound_head() for skb frag page
flat view
STALE1860d
SUPERSEDED
From: Yunsheng Lin <hidden>
Date: 2021-09-14 12:12:49
Also in:
lkml
Subsystem:
networking [general], page pool, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jesper Dangaard Brouer, Ilias Apalodimas, Linus Torvalds
Revision v2 of 5 in this series.
Revisions (5)
As the page for a skb frag is always a head page, so make sure skb_pp_recycle() passes a head page to avoid calling compound_head() for skb frag page case. Signed-off-by: Yunsheng Lin <redacted> --- include/linux/skbuff.h | 2 +- net/core/page_pool.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6bdb0db3e825..35eebc2310a5 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h@@ -4722,7 +4722,7 @@ static inline bool skb_pp_recycle(struct sk_buff *skb, void *data) { if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb->pp_recycle) return false; - return page_pool_return_skb_page(virt_to_page(data)); + return page_pool_return_skb_page(virt_to_head_page(data)); } #endif /* __KERNEL__ */
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index ba9f14deacf4..09d7b8614ef5 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c@@ -740,8 +740,6 @@ bool page_pool_return_skb_page(struct page *page) { 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
--
2.33.0