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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1FA7D59D99 for ; Mon, 15 Dec 2025 07:10:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16A7D6B0008; Mon, 15 Dec 2025 02:10:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 11B126B000A; Mon, 15 Dec 2025 02:10:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFDA86B000C; Mon, 15 Dec 2025 02:10:46 -0500 (EST) 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 CF0036B0008 for ; Mon, 15 Dec 2025 02:10:46 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4E26613C47B for ; Mon, 15 Dec 2025 07:10:46 +0000 (UTC) X-FDA: 84220832892.01.EBD791B Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf10.hostedemail.com (Postfix) with ESMTP id 3AD52C000B for ; Mon, 15 Dec 2025 07:10:43 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; spf=pass (imf10.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=1765782644; a=rsa-sha256; cv=none; b=8rdbvvyuLdKlOppUpjJy5IZ4MNxlN9JkUHhfsgBbOPIGjXzcBbn1igOWIFAPfoGMuBZ/Md wZz74KAoSQTbmjeFxZ6y83ROqtCBbwa8UvxdUAkskN00n2Sz+EPNhevJi/JHaFWgkq3LpU fTbsY98y2UsunkDeyik8C/WrlR8Nz3w= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf10.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=1765782644; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ntRVadRMX6QYMydz25v+bMm5fhdxd9jJGz9OeHvzCCw=; b=1X8eCMJ3pyuQAJywfkCbRbwlh9DdSxYSPo15CMNtSaomPvIH0iI9TT9PLiDNl7QnjNknFp RD6MJKxqH49gW0Qg/ZCGNvoJQ5Dbon7bnVClIpf2BPwrxvHTlYxEmgGNal8/GDxAL9LxUw QwJe18W7fQCYMUxRl7YDXt0jwAPlT8E= X-AuditID: a67dfc5b-c2dff70000001609-53-693fb4702647 From: Byungchul Park To: linux-mm@kvack.org, akpm@linux-foundation.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, 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, dw@davidwei.uk, ap420073@gmail.com, dtatulea@nvidia.com Subject: [PATCH 1/2] mm: introduce a new page type for page pool in page type Date: Mon, 15 Dec 2025 16:10:00 +0900 Message-Id: <20251215071001.78263-2-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20251215071001.78263-1-byungchul@sk.com> References: <20251215071001.78263-1-byungchul@sk.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa1BMYRzGvfuePee0WnMs6uAD1hgzLlFT+bsMDYPzgRmN4QNjakdntNTW 7HafYYqIRiGXrS3JRHfWrGy7TZHKJmWsUnNcuogk1kpYUiZnawzfnnme9/d7v/xprGiWzqHV mhheq1FFKEkZIfvkeXV5dOUG9Urz0FLIM1aQUP4zAYp7LVIYqRiQQF6ZGcG3kZcUjNfaEHxt bCLhY8MwgsKrLgx5T1IJ+G78hcFaPYDgQ/YNEvptfRSUm7ZDT9E7AmrSqjD0nXlIQkbqKIba EScFRy0lovh2MgV2c6YULvy6jqEquZeC9uo8ErorxqXwrj6DgGZDKQFDFxsx9GQGga3AC1wt DgSNxioJuE5fJqEjp1oCd2o7KDjfVkDCm9QeBG0NfQRcHDtJQm5KJoLRn6LSefabFHIfdFNB PlyKIJBcg+Mz5ipLn0u4zuxzBCfcfSThrIYuiiswxXK3S5Zw6UIb5kxlp0jONJxFca86a0ju YfYowVlfr+aslq8SLuOYk9wxa49sXRgfoY7jtSvWh8rC+weNkujW4IQO2w2cjGwb05EHzTL+ bNvodeJvrrl2E7kzySxmBWEEu/NMZjt70/xM7GU0ZpwUW3PvB+keZohDmv7EBEwwi1hLaZ00 HdG0nAlgix57TDrnseW36iY8HkwgW9h1acKvEJ9kDeonspyZzjbnvCXcKBb/NeYr3DUW0WN3 cvGkZohm7xb7TubZ7P0SgTiLGMN/tOEfbfiPLkC4DCnUmrhIlTrC3yc8UaNO8NkfFWlC4oEV HR7ba0HD9p31iKGR0lNur1yvVkhVcbrEyHrE0lg5U35SECt5mCoxiddGhWhjI3hdPZpLE0pv uZ8rPkzBHFDF8Id4PprX/l0ltMecZIRDY8+UykLlrh/290VPo4I2RSUFN05LD0QH076Mb961 NmxZiCO+ZWzKABXc+qLEO2BG9bYYP/vxreH0q6Z2wXt6Yd2qwSk71+RodEcdW7zOj7Pa3Vkt Id3z61KII54Lu35XLXCQ+sA1+WbrFVmIvvhaWcYVRWKa1Nmk1y6dOhy4T0nowlW+S7BWp/oD gWEQr1wDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA02SWUwTURSGvb3TmaHaZCwIIyYam6gJiQtGySEYJDzoRKPRJyMPSiOjHaFI WmnAJQFpZIkgqCCUYuqGstaUrSDIUiig4oJiRmVREI0bqCBa0eAUY/Ttz7985+XQWFUu96eF 2MO8PlYToyYVhGJ7SMrKuOqNwhrTiB9YbOUklH1PgGsvHHJwl7+RgaW0FsGk+zkFM00uBBPt nSS8d35BcPniFAbLfRMBX20/MNQ3vEHwLr+ChFHXMAVl9m0wVPyagMbUOgzDp7tIyDRNY2hy j1FwwnFdAlclUeAs6pbDg9osOZz7cRVDXdILCh41WEgYLJ+Rw+u2TAK6zSUEfMptxzCUFQYu qy9M3fmAoN1WJ4OpU0Uk9BU0yKCmqY+Cs71WEkZMQwh6ncME5P5MI6EwOQvB9HcJOZY9KYfC jkEqbDWXLIok5/wwjrnqkqcy7kl+DsGJt27LuHrzAMVZ7fFc1fUALkPsxZy9NJ3k7F/OUFz/ k0aS68qfJrj6l8FcvWNCxmWmjJE7fCMUG6L4GMHI61eHRiq0o29tsri7OxP6XBU4CbnCM5AX zTLr2MYrlcijSWYFK4pu7NE+zDa2svax5CtozIxRbGPzN9ITeEtB6vmThEcTzDLWUdIiz0A0 rWTWs8U9Xn+YS9iyGy2zHC8miL08kDfLV0mVM2/Pz2olM5/tLnhFeKZYumu7oPLYWJqm1BTi bKQ0/9cy/2uZ/2tZES5FPkKsUacRYtavMkRrE2OFhFX7DunsSPqh4uM/cxxo8tHmNsTQSD1P Kd4MFVRyjdGQqGtDLI3VPso0UbKUUZrEI7z+0F59fAxvaEOLaELtp9yyi49UMQc0h/lono/j 9X9TGe3ln4SSX3q38xGf50xQHell6We1iwbs+mNPjT3wyVJlDInssF46ujWsIHRB3W6he2BT UNbC3R+NS385iwqe3escz+73HUoI8g3X6nsuNKVO1sbPWJZrdaagHJ+IDMV81n+/GCw8iH74 fG7KXj7v4NqNFYE7O5rdupY9z6rMi1s/V7aeWKEmDFpNYADWGzS/ARsnlsU/AwAA X-CFilter-Loop: Reflected X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 3AD52C000B X-Stat-Signature: dm3htk6qaxfwcq7w6mhx5gwy6sttbw4p X-Rspam-User: X-HE-Tag: 1765782643-186968 X-HE-Meta: U2FsdGVkX1/y9rvncGr+chSRoR97u6AucI6VUt9Z7gTdKbetjH4ZhrvQwpAhlgAzv/B6tOFb1Tg3OrsYUk8Qsusy77nor9cMX6XQIpzDo322IYsaDMaaC1H/eYA+oQAEhxvLXPOaGbJioNqq64sRTwAAqXjjv17eC8OgXKBlxFljf3zoWQ81UfXBFDliaenbhx4O+Vz2wW1q5pn898WX19vzm4mcMLY/PC5b/f4MAqvGvyw2N5CdDj6HoMKT8MEn7yYEd0aTqd3vo2JEeBYw7YnV5DT2lw6JelwG08OlWT0eSljGxZwkb4APPZeypo+iA1kx4KUXSYNi4dvjcEhIGEydkVf5bzh2a8P6FPVMthG7I9ORHwPcep4aV3L6IIQA0M+69GYmQ70861x+k2kEPnzoxeRElR9+QYOUMLSY6tqM6zXXE4cb0k5KcfiOomasXzwLkfC1v5DxuXyTFfM8Z1w1tzrIo20SijuiagaAa74ZKEiNwwINflTPDzcH3kjK9pAa+sVZBEnYLY2F/2juC/mb9MP69KeEgNGNCYMEIamlQYRkzlyNrrPpuBif18JpeFoBbRFjVjvx6psBuKMvKLzmkztri3saTyq/X+JoCgNhpfd+08Do2t8mofafMkkMH7Sr77BYmXuDlzJutvSaGQ0qMgJ3HwaA43YuS8kNDx0Onwb7KJx4HzYiC2Kg+Xhe34g8MoEXXBbfxKzeBgDy/965QI1u2zpLFCtU6Ur6QUJ9KKslMPghDtOUZ5MhtBb1ODzd7ZQsrtxI1y+yTyydsYrPG83vVfapwCTsJf4bmJukpeGzT+H+wF5X/x+FrfrVnm9byU8F3iHB1ktiiQseEUgddKbwVUccROFqA6TjfarP07Rf4g0S2ER8qYXrJb9l1Y8zhrqumu2eup5hBfopqwa0ZjvpXWa4/7O6Tsm3UDc/67WIy2SiZ8ObzwiqRqB8WMlyS3VZQyIrnAzyGSN JWv1P3RG N5uEIAyzBP9KvXAXQxNKU7orBptiewq5bPAquQcc1D/6uBZtYdRGTSA5zRsVb5iUt3Vnldgw6Wv4qLfRpcCPhnRGtnghExJj23vDyphGxa6UjtB07RToMkazWwjX8PDI8KifHk5ssOPKuf9Gu459QpGZYKPY2QxwVkabJwEuN3UYu+hWDuyUsrGVWozBEBIHQTQ341fGV2vBzre7sxGJ8eptULF27UPs4Llksn846XkgyY68= 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: Currently, the condition 'page->pp_magic == PP_SIGNATURE' is used to determine if a page belongs to a page pool. However, with the planned removal of @pp_magic, we should instead leverage the page_type in struct page, such as PGTY_netpp, for this 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(). Plus, add @page_type to struct net_iov at the same offset as struct page so as to use the page_type APIs for struct net_iov as well. While at it, reorder @type and @owner in struct net_iov to avoid a hole and increasing the struct size. This work was inspired by the following link: https://lore.kernel.org/all/582f41c0-2742-4400-9c81-0d46bf4e8314@gmail.com/ While at it, move the sanity check for page pool to on the free path. Suggested-by: David Hildenbrand Co-developed-by: Pavel Begunkov Signed-off-by: Pavel Begunkov Signed-off-by: Byungchul Park Acked-by: David Hildenbrand Acked-by: Zi Yan Reviewed-by: Toke Høiland-Jørgensen --- .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- include/linux/mm.h | 27 +++---------------- include/linux/page-flags.h | 6 +++++ include/net/netmem.h | 15 +++++++++-- mm/page_alloc.c | 11 +++++--- net/core/netmem_priv.h | 20 +++++--------- net/core/page_pool.c | 18 +++++++++++-- 7 files changed, 53 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c index 80f9fc10877ad..7d90d2485c787 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(pp_page_to_nmdesc(page)->pp, diff --git a/include/linux/mm.h b/include/linux/mm.h index 15076261d0c2e..94f824bf0d38c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4565,10 +4565,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. * @@ -4603,26 +4602,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(const struct page *page) -{ - return (page->pp_magic & PP_MAGIC_MASK) == PP_SIGNATURE; -} -#else -static inline bool page_pool_page_is_pp(const 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 f7a0e4af0c734..39a21ee87b437 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -934,6 +934,7 @@ enum pagetype { PGTY_zsmalloc = 0xf6, PGTY_unaccepted = 0xf7, PGTY_large_kmalloc = 0xf8, + PGTY_netpp = 0xf9, PGTY_mapcount_underflow = 0xff }; @@ -1066,6 +1067,11 @@ PAGE_TYPE_OPS(Zsmalloc, zsmalloc, zsmalloc) PAGE_TYPE_OPS(Unaccepted, unaccepted, unaccepted) PAGE_TYPE_OPS(LargeKmalloc, 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/include/net/netmem.h b/include/net/netmem.h index 9e10f4ac50c3d..2a73b68f16b15 100644 --- a/include/net/netmem.h +++ b/include/net/netmem.h @@ -110,10 +110,21 @@ struct net_iov { atomic_long_t pp_ref_count; }; }; - struct net_iov_area *owner; + + unsigned int page_type; enum net_iov_type type; + struct net_iov_area *owner; }; +/* Make sure 'the offset of page_type in struct page == the offset of + * type in struct net_iov'. + */ +#define NET_IOV_ASSERT_OFFSET(pg, iov) \ + static_assert(offsetof(struct page, pg) == \ + offsetof(struct net_iov, iov)) +NET_IOV_ASSERT_OFFSET(page_type, page_type); +#undef NET_IOV_ASSERT_OFFSET + struct net_iov_area { /* Array of net_iovs for this area. */ struct net_iov *niovs; @@ -256,7 +267,7 @@ static inline unsigned long netmem_pfn_trace(netmem_ref netmem) */ #define pp_page_to_nmdesc(p) \ ({ \ - DEBUG_NET_WARN_ON_ONCE(!page_pool_page_is_pp(p)); \ + DEBUG_NET_WARN_ON_ONCE(!PageNetpp(p)); \ __pp_page_to_nmdesc(p); \ }) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5bb3a7844abb6..c126a9790953b 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.f & 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,15 @@ __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))) { + /* networking expects to clear its page type before releasing */ + if (unlikely(PageNetpp(page))) { + bad_page(page, "page_pool leak"); + return false; + } /* 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/netmem_priv.h b/net/core/netmem_priv.h index 23175cb2bd866..6b7d90b8ebb9b 100644 --- a/net/core/netmem_priv.h +++ b/net/core/netmem_priv.h @@ -8,21 +8,15 @@ static inline unsigned long netmem_get_pp_magic(netmem_ref netmem) return netmem_to_nmdesc(netmem)->pp_magic & ~PP_DMA_INDEX_MASK; } -static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic) -{ - netmem_to_nmdesc(netmem)->pp_magic |= pp_magic; -} - -static inline void netmem_clear_pp_magic(netmem_ref netmem) -{ - WARN_ON_ONCE(netmem_to_nmdesc(netmem)->pp_magic & PP_DMA_INDEX_MASK); - - netmem_to_nmdesc(netmem)->pp_magic = 0; -} - static inline bool netmem_is_pp(netmem_ref netmem) { - return (netmem_get_pp_magic(netmem) & PP_MAGIC_MASK) == PP_SIGNATURE; + /* XXX: Now that the offset of page_type is shared between + * struct page and net_iov, just cast the netmem to struct page + * unconditionally by clearing NET_IOV if any, no matter whether + * it comes from struct net_iov or struct page. This should be + * adjusted once the offset is no longer shared. + */ + return PageNetpp(__netmem_to_page((__force unsigned long)netmem & ~NET_IOV)); } 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 265a729431bb7..323314b1333ee 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -703,7 +703,14 @@ 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); + + /* XXX: Now that the offset of page_type is shared between + * struct page and net_iov, just cast the netmem to struct page + * unconditionally by clearing NET_IOV if any, no matter whether + * it comes from struct net_iov or struct page. This should be + * adjusted once the offset is no longer shared. + */ + __SetPageNetpp(__netmem_to_page((__force unsigned long)netmem & ~NET_IOV)); /* Ensuring all pages have been split into one fragment initially: * page_pool_set_pp_info() is only called once for every page when it @@ -718,7 +725,14 @@ void page_pool_set_pp_info(struct page_pool *pool, netmem_ref netmem) void page_pool_clear_pp_info(netmem_ref netmem) { - netmem_clear_pp_magic(netmem); + /* XXX: Now that the offset of page_type is shared between + * struct page and net_iov, just cast the netmem to struct page + * unconditionally by clearing NET_IOV if any, no matter whether + * it comes from struct net_iov or struct page. This should be + * adjusted once the offset is no longer shared. + */ + __ClearPageNetpp(__netmem_to_page((__force unsigned long)netmem & ~NET_IOV)); + netmem_set_pp(netmem, NULL); } -- 2.17.1