From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FD30C83F17 for ; Mon, 28 Jul 2025 10:57:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A86196B0089; Mon, 28 Jul 2025 06:57:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A37526B008A; Mon, 28 Jul 2025 06:57:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FF9E6B008C; Mon, 28 Jul 2025 06:57:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7F0336B0089 for ; Mon, 28 Jul 2025 06:57:58 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CFEB6573BF for ; Mon, 28 Jul 2025 10:57:57 +0000 (UTC) X-FDA: 83713373394.24.1457D8F Received: from invmail4.hynix.com (exvmail4.skhynix.com [166.125.252.92]) by imf21.hostedemail.com (Postfix) with ESMTP id D07BF1C0005 for ; Mon, 28 Jul 2025 10:57:55 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; spf=pass (imf21.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1753700276; a=rsa-sha256; cv=none; b=XcE6EfMV3kbISKGl4wfppR5krWtb0K5LJ8SFDVBr+WX7oxqUpaobQJEbvpY+eDWriTN0TR xv72N07U8CB74tr2IhxvveayHCSd4hykJ+ddf/9LXvtw132Jj3gZtY8Zr6yhqo81JNn+bv /t9d4W9SENr9FjCuY54hV5NAfrfclLA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf21.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1753700276; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AxMTrsJk+MX0YFFsud5lomvtNxRwEDte7x5tftwBzRU=; b=c5TDD6b6Zl1BncVLVaS8PiRrF8TUm16MwGcdFspWXyuNxOPVv9nPwTtXKdOjkZhSw8dd2G QBqEJQPjOyQXxUKqqFZtdZjAZ05wTorIbHEXZUYnQoP4Q9vLLLiYnefjHl8QWKf/HknbYW US83QHUBldo4oKvsHM+WM28u3X23E38= X-AuditID: a67dfc5b-669ff7000002311f-41-688757afd71e Date: Mon, 28 Jul 2025 19:57:46 +0900 From: Byungchul Park To: linux-mm@kvack.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel_team@skhynix.com, harry.yoo@oracle.com, ast@kernel.org, daniel@iogearbox.net, davem@davemloft.net, kuba@kernel.org, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, saeedm@nvidia.com, leon@kernel.org, tariqt@nvidia.com, mbloch@nvidia.com, andrew+netdev@lunn.ch, edumazet@google.com, pabeni@redhat.com, akpm@linux-foundation.org, david@redhat.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, vbabka@suse.cz, rppt@kernel.org, surenb@google.com, mhocko@suse.com, horms@kernel.org, jackmanb@google.com, hannes@cmpxchg.org, ziy@nvidia.com, ilias.apalodimas@linaro.org, willy@infradead.org, brauner@kernel.org, kas@kernel.org, yuzhao@google.com, usamaarif642@gmail.com, baolin.wang@linux.alibaba.com, almasrymina@google.com, toke@redhat.com, asml.silence@gmail.com, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, sfr@canb.auug.org.au Subject: Re: [PATCH v2] mm, page_pool: introduce a new page type for page pool in page type Message-ID: <20250728105746.GB21732@system.software.com> References: <20250728052742.81294-1-byungchul@sk.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250728052742.81294-1-byungchul@sk.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-Brightmail-Tracker: H4sIAAAAAAAAA02Se0xTZxjG853v9JzTYs2xon7WmJiaiWKGzqB7ZWYy5Y8vMS4YgxrvRY5r M4qkFQZLCKh4IwKimEgtsUQRClVIVaAI05WbDKcELzmKk8vAS2DowKEFA3IwZv73y/O+z/O8 f7wC1nlVesEct1+yxhljDZyG1fwzpeDr8s1HTUuv3ETgKHNzUPo+CYo6q1TgKKlA8NbfzsN4 bSOCofomDvrqBhFcKBjG4LiXzsJ/ZSMYehu7eSj1rIeOS89ZqDlaiaE7+zYHmemjGGr9Azwc rCpmwHE1jYfWiiwV5I4UYqhM6+ThfrWDg2fucRU892Wy0Gx3sfDmTD2GjqxwaHTOhOGWfgT1 ZZUMDJ/I5+BhXjUD12sf8nC6zcnB3+kdCNrqulk48+EYB+cOZCEYfT8ROXDyrQrONTzjwxfT A7LM0br+15hecz1mqPzbHwz12v/iqdOTQK8WB9MMuQ1TT8lxjnoGT/H06aMajt4+O8pSb9dK 6q0aYmjmoQGO/tv7hI0M3KpZFSPFmhMl65Lvd2tMea7o+JYNSf0lPpyGLv+QgdQCEUPJA9cV lIGESc53LldkVvyKHD/kVinMiUFElv1Y4UAxhAw1jrAZSCNg8SxPctw1nOKdLu4g5Te/U3a0 IpCeu9mMwjpxOfEefMd+0qeR5ryeScZiMJHHXjGKFYtzSNGYoMhqcQUpah6brJ0hzie3KpoY pYqIPQLJfnBN9enk2eT3Ypk9iUT7F7H2L2Lt/8c6ES5BOnNcosVojg0NMSXHmZNC9uyzeNDE Q11K+bCtCg22bvQhUUCGKdqX3x4x6VTGRFuyxYeIgA2B2vjCCUkbY0z+VbLu22VNiJVsPjRH YA2ztMuGf4nRiT8Z90s/S1K8ZP08ZQS1Pg3t3YJXw87oP338DtuagqiwH28Un9++pZwcDuA2 2Z2ptCu8r/ziyhunN8+0LLKMq+eGpazt1fvt7NLC1L7d/khuYW7uwrWrUiIaQL4QdC9av0S/ 13cnInXuOpt73ovSnJZFI1ENRaMD79RP7lSHtU/1n28y50TMsC0b6nQFaPV3FxhYm8n4TTC2 2owfAdeuInBMAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0hTYRjHec97bq4Gp6V1MIhYV4bZdfV0v0D0VhZFUBFFnfTURvPCVqJB sdyotDS7GDknrUydZlmr1NnMmKaZdMFIZpaaWRQNu2iWFyxXRH378X+e3/N8+fNYlcWE8vqY fbIxRjKoWQWtWLfAMrV481Hd9NQcDdiLi1i48iMB8tvKGLAXliDo7m3m4GdFDYKu6loWPlZ9 RZBzsQeD/YmVhm/FfRje1rRzcMW1Flrz3tHgOVqKof3kAxZSrf0YKno7OUgqc1Jgv2nmoCq7 joGnJWkMnO3LxVBqbuPgWbmdhZainwy886bSUGcroOFzRjWG1rSlUOMYBT31fgTVxaUU9JzI ZuF5ZjkFtyuec3CmwcHCG2srgoaqdhoyBo6xkHU4DUH/j6GTnendDGTdb+GWhpHDPh9Lqvyf MLlV0EQR392HFHHbXnHE4dpPbjo1JMXXgImrMJklrq+nOfKy0cOSB+f7aeJ+PY+4y7ookmrp ZMmXty/o9SFbFQujZIM+XjZOW7xTocss2BVXvyHBX+jFZnR1WQrieVGYLWY7tCkoiKeFiWKy pYgJMCtMFn2+XhzgYCFc7Krpo1OQgsfCeU48VeRhA+5IYbt4vXJBYEcpgNjx+CQVYJWgFd1J 3+k/+QixLrPjN2NBI/oGP1ABFQtjxPxBPhAHCXPE/LrB329DhPHivZJaKh0pbf/Ztv9s2z/b gXAhCtbHxEdLeoM23LRXlxijTwiPjI12oaHK5B0cOFWGup+t9CKBR+rhyvdzj+hUjBRvSoz2 IpHH6mBlXO5QpIySEg/Ixtgdxv0G2eRFY3haPVq5erO8UyXskfbJe2U5Tjb+nVJ8UKgZzbq8 aWVJ0zVjdNuX3WPfN21ccTV0o2l4kvlz9YSnlcHX/RGNIY/c85VLRt2qXb7trjOvXBpYNFV/ fK5lj3NW7bessEtOsuW41BWW2TJtU9IdJuxQck7o6xuxZ+otHv+iSQatKXL6TGeQdZi1Z8o4 ba7nAhO36lxGx5qQyPQIlSbD36ymTTpphgYbTdIvbYdATi4DAAA= X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: D07BF1C0005 X-Stat-Signature: a5gzrn6mfgp9xqndxbbcrrfhjibfyhmo X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1753700275-47398 X-HE-Meta: U2FsdGVkX1/5Q3UwNrkM4I6gwat6S4dmn8yimVWPv2OEZJj1835wL+TDvkhUMYHrvImzs/Byo/lRgPYj++T9zCEF2LewCuKExqWX4kBARBKtomFZmgKT1aZOGN0Cay050AOLlsJPbdPc7SBLF/D7F0V4CtTQBvCJJIgttvaEc394Adw0dFmp5Q6YYB8GjKOzu8KWZRQ6w9GLoCvOCd/ytFYxfMcURrXR/6yCKp7aTQ4IKMEF841qiS/Tb3QqjTjrLkpRyJlk8Q5UuS/WTDnXRroBBh4s7LtceRCb6NUEnkUh6SGzeMEiTA2MMN3wGaLiY9sUN/w18s80/zbvIF4wFqC/1q5J9qJcxgXnuhQVt1qJFPdjTvp6KDbm+EXR0SaPtRze7PtqVZo8Y2sec7YW0uMPksB/SJ68R+a4aXa6Ek/3m29bA79RzUIKReSXIl/scOIhzerHa9CuOtrlceTR5vzjOuRHgWrn1ZwTKveKrw4gFAmzVfmavEi2NoPugw/tDIsSxdeePe1X+gLBwUNA9KiuJuLvDjwp9ePyYikhryIA2lDmI0Nn1QecRQj5EUe6keO0pVuHienqMTIu7n3wf0ReAlxowxizrv8/BcNyWtOkTAUyjDRbPIYlEFimTgib4ToKNeLDD1KSgGcy2Gh7k+wHAKZt3WtdIuloARQN6xEoHRP34je+ArvotwAM5uu3H7aLdue0kerneLii4LJN0iHQ0cgjzJhGiJbzaZkbdmqhnF4GwjCr4cZrasRTkI62KRvcswCuvqhhYfmlvXZZQFbY9ztkNN5JavG98Q9mXWKtIEIkSrqJ+NngtVnLiRSfwKNl20XmmRMkD9oPFHEWCZzz47wVUPiKvjwpmCMA8ofNl84nunMrTf1RKBCrUu4I6qr6oZyLRMJSDI6XBeCQO91snytxts+EJPjGILz57eyklAK6x/5hkOGHFJWt0HwZpLnd/OdMY/RFwFFlEpc 0dhTJldz atdli3EWGWVA3JPRyFIJZ8CCjLtQ+8O/iLL+6u4OuysBUvARHuFGXuuSaTaEUhrmz7paTCu+OVzWEPKKxob88aNVCWAur3CV0yRfVt3x4S2iCn2e3zu2fIDm9Kcp8xiwz3IfTYb4Wi0PbWSdkcGaKWJeOIyRcohb8CExAmlGKWHu0Pu/zQk1VjFIMF+f15axcJ9xCtZAZvh5Jzuh4u+1Fj8qIxzYAhEbbLWRUjUfC+zkjBZNPPRtHG0CQPm4CQcIA0hNlRNsOIjMMp9DTqtYWDUbgzrfvxBvknGmxhUoL3g9xN5o= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon, Jul 28, 2025 at 02:27:42PM +0900, Byungchul Park wrote: > Changes from v1: > 1. Rebase on linux-next. +cc sfr@canb.auug.org.au Byungchul > 2. Initialize net_iov->pp = NULL when allocating net_iov in > net_devmem_bind_dmabuf() and io_zcrx_create_area(). > 3. Use ->pp for net_iov to identify if it's pp rather than > always consider net_iov as pp. > 4. Add Suggested-by: David Hildenbrand . > > ---8<--- > >From 08b65324282bbe683a2479faef8eb24df249fd18 Mon Sep 17 00:00:00 2001 > From: Byungchul Park > Date: Mon, 28 Jul 2025 14:07:17 +0900 > Subject: [PATCH v2] mm, page_pool: introduce a new page type for page pool in page type > > ->pp_magic field in struct page is current used to identify if a page > belongs to a page pool. However, ->pp_magic will be removed and page > type bit in struct page e.i. PGTY_netpp can be used for that purpose. > > Introduce and use the page type APIs e.g. PageNetpp(), __SetPageNetpp(), > and __ClearPageNetpp() instead, and remove the existing APIs accessing > ->pp_magic e.g. page_pool_page_is_pp(), netmem_or_pp_magic(), and > netmem_clear_pp_magic(). > > For net_iov, use ->pp to identify if it's pp, with making sure that ->pp > is NULL for non-pp net_iov. > > This work was inspired by the following link: > > [1] https://lore.kernel.org/all/582f41c0-2742-4400-9c81-0d46bf4e8314@gmail.com/ > > While at it, move the sanity check for page pool to on free. > > Suggested-by: David Hildenbrand > Signed-off-by: Byungchul Park > --- > .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- > include/linux/mm.h | 27 +++---------------- > include/linux/page-flags.h | 6 +++++ > io_uring/zcrx.c | 1 + > mm/page_alloc.c | 7 +++-- > net/core/devmem.c | 1 + > net/core/netmem_priv.h | 23 +++++++--------- > net/core/page_pool.c | 10 +++++-- > 8 files changed, 33 insertions(+), 44 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > index 5ce1b463b7a8..79a3ceff3952 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > @@ -707,7 +707,7 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, > xdpi = mlx5e_xdpi_fifo_pop(xdpi_fifo); > page = xdpi.page.page; > > - /* No need to check page_pool_page_is_pp() as we > + /* No need to check PageNetpp() as we > * know this is a page_pool page. > */ > page_pool_recycle_direct(page->pp, page); > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 3bfb566ad202..d01b296e7184 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -4171,10 +4171,9 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status); > * DMA mapping IDs for page_pool > * > * When DMA-mapping a page, page_pool allocates an ID (from an xarray) and > - * stashes it in the upper bits of page->pp_magic. We always want to be able to > - * unambiguously identify page pool pages (using page_pool_page_is_pp()). Non-PP > - * pages can have arbitrary kernel pointers stored in the same field as pp_magic > - * (since it overlaps with page->lru.next), so we must ensure that we cannot > + * stashes it in the upper bits of page->pp_magic. Non-PP pages can have > + * arbitrary kernel pointers stored in the same field as pp_magic (since > + * it overlaps with page->lru.next), so we must ensure that we cannot > * mistake a valid kernel pointer with any of the values we write into this > * field. > * > @@ -4205,26 +4204,6 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status); > #define PP_DMA_INDEX_MASK GENMASK(PP_DMA_INDEX_BITS + PP_DMA_INDEX_SHIFT - 1, \ > PP_DMA_INDEX_SHIFT) > > -/* Mask used for checking in page_pool_page_is_pp() below. page->pp_magic is > - * OR'ed with PP_SIGNATURE after the allocation in order to preserve bit 0 for > - * the head page of compound page and bit 1 for pfmemalloc page, as well as the > - * bits used for the DMA index. page_is_pfmemalloc() is checked in > - * __page_pool_put_page() to avoid recycling the pfmemalloc page. > - */ > -#define PP_MAGIC_MASK ~(PP_DMA_INDEX_MASK | 0x3UL) > - > -#ifdef CONFIG_PAGE_POOL > -static inline bool page_pool_page_is_pp(struct page *page) > -{ > - return (page->pp_magic & PP_MAGIC_MASK) == PP_SIGNATURE; > -} > -#else > -static inline bool page_pool_page_is_pp(struct page *page) > -{ > - return false; > -} > -#endif > - > #define PAGE_SNAPSHOT_FAITHFUL (1 << 0) > #define PAGE_SNAPSHOT_PG_BUDDY (1 << 1) > #define PAGE_SNAPSHOT_PG_IDLE (1 << 2) > diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h > index 8e4d6eda8a8d..548a68415845 100644 > --- a/include/linux/page-flags.h > +++ b/include/linux/page-flags.h > @@ -935,6 +935,7 @@ enum pagetype { > PGTY_zsmalloc = 0xf6, > PGTY_unaccepted = 0xf7, > PGTY_large_kmalloc = 0xf8, > + PGTY_netpp = 0xf9, > > PGTY_mapcount_underflow = 0xff > }; > @@ -1079,6 +1080,11 @@ PAGE_TYPE_OPS(Zsmalloc, zsmalloc, zsmalloc) > PAGE_TYPE_OPS(Unaccepted, unaccepted, unaccepted) > FOLIO_TYPE_OPS(large_kmalloc, large_kmalloc) > > +/* > + * Marks page_pool allocated pages. > + */ > +PAGE_TYPE_OPS(Netpp, netpp, netpp) > + > /** > * PageHuge - Determine if the page belongs to hugetlbfs > * @page: The page to test. > diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c > index 100b75ab1e64..34634552cf74 100644 > --- a/io_uring/zcrx.c > +++ b/io_uring/zcrx.c > @@ -444,6 +444,7 @@ static int io_zcrx_create_area(struct io_zcrx_ifq *ifq, > area->freelist[i] = i; > atomic_set(&area->user_refs[i], 0); > niov->type = NET_IOV_IOURING; > + niov->pp = NULL; > } > > area->free_count = nr_iovs; > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index fa09154a799c..cb90d6a3fd9d 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1042,7 +1042,6 @@ static inline bool page_expected_state(struct page *page, > #ifdef CONFIG_MEMCG > page->memcg_data | > #endif > - page_pool_page_is_pp(page) | > (page->flags & check_flags))) > return false; > > @@ -1069,8 +1068,6 @@ static const char *page_bad_reason(struct page *page, unsigned long flags) > if (unlikely(page->memcg_data)) > bad_reason = "page still charged to cgroup"; > #endif > - if (unlikely(page_pool_page_is_pp(page))) > - bad_reason = "page_pool leak"; > return bad_reason; > } > > @@ -1379,9 +1376,11 @@ __always_inline bool free_pages_prepare(struct page *page, > mod_mthp_stat(order, MTHP_STAT_NR_ANON, -1); > folio->mapping = NULL; > } > - if (unlikely(page_has_type(page))) > + if (unlikely(page_has_type(page))) { > + WARN_ON_ONCE(PageNetpp(page)); > /* Reset the page_type (which overlays _mapcount) */ > page->page_type = UINT_MAX; > + } > > if (is_check_pages_enabled()) { > if (free_page_is_bad(page)) > diff --git a/net/core/devmem.c b/net/core/devmem.c > index b3a62ca0df65..40e7a4ec9009 100644 > --- a/net/core/devmem.c > +++ b/net/core/devmem.c > @@ -285,6 +285,7 @@ net_devmem_bind_dmabuf(struct net_device *dev, > niov = &owner->area.niovs[i]; > niov->type = NET_IOV_DMABUF; > niov->owner = &owner->area; > + niov->pp = NULL; > page_pool_set_dma_addr_netmem(net_iov_to_netmem(niov), > net_devmem_get_dma_addr(niov)); > if (direction == DMA_TO_DEVICE) > diff --git a/net/core/netmem_priv.h b/net/core/netmem_priv.h > index cd95394399b4..4b90332d6c64 100644 > --- a/net/core/netmem_priv.h > +++ b/net/core/netmem_priv.h > @@ -8,21 +8,18 @@ static inline unsigned long netmem_get_pp_magic(netmem_ref netmem) > return __netmem_clear_lsb(netmem)->pp_magic & ~PP_DMA_INDEX_MASK; > } > > -static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic) > -{ > - __netmem_clear_lsb(netmem)->pp_magic |= pp_magic; > -} > - > -static inline void netmem_clear_pp_magic(netmem_ref netmem) > -{ > - WARN_ON_ONCE(__netmem_clear_lsb(netmem)->pp_magic & PP_DMA_INDEX_MASK); > - > - __netmem_clear_lsb(netmem)->pp_magic = 0; > -} > - > static inline bool netmem_is_pp(netmem_ref netmem) > { > - return (netmem_get_pp_magic(netmem) & PP_MAGIC_MASK) == PP_SIGNATURE; > + /* Use ->pp for net_iov to identify if it's pp, which requires > + * that non-pp net_iov should have ->pp NULL'd. > + */ > + if (netmem_is_net_iov(netmem)) > + return !!__netmem_clear_lsb(netmem)->pp; > + > + /* For system memory, page type bit in struct page can be used > + * to identify if it's pp. > + */ > + return PageNetpp(__netmem_to_page(netmem)); > } > > static inline void netmem_set_pp(netmem_ref netmem, struct page_pool *pool) > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index 05e2e22a8f7c..0a10f3026faa 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -654,7 +654,6 @@ s32 page_pool_inflight(const struct page_pool *pool, bool strict) > void page_pool_set_pp_info(struct page_pool *pool, netmem_ref netmem) > { > netmem_set_pp(netmem, pool); > - netmem_or_pp_magic(netmem, PP_SIGNATURE); > > /* Ensuring all pages have been split into one fragment initially: > * page_pool_set_pp_info() is only called once for every page when it > @@ -665,12 +664,19 @@ void page_pool_set_pp_info(struct page_pool *pool, netmem_ref netmem) > page_pool_fragment_netmem(netmem, 1); > if (pool->has_init_callback) > pool->slow.init_callback(netmem, pool->slow.init_arg); > + > + if (netmem_is_net_iov(netmem)) > + return; > + __SetPageNetpp(__netmem_to_page(netmem)); > } > > void page_pool_clear_pp_info(netmem_ref netmem) > { > - netmem_clear_pp_magic(netmem); > netmem_set_pp(netmem, NULL); > + > + if (netmem_is_net_iov(netmem)) > + return; > + __ClearPageNetpp(__netmem_to_page(netmem)); > } > > static __always_inline void __page_pool_release_netmem_dma(struct page_pool *pool, > > base-commit: 97987520025658f30bb787a99ffbd9bbff9ffc9d > -- > 2.17.1