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 4419AC36010 for ; Mon, 7 Apr 2025 08:54:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F00556B0005; Mon, 7 Apr 2025 04:54:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E85066B0007; Mon, 7 Apr 2025 04:54:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D25C76B0008; Mon, 7 Apr 2025 04:54:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B24636B0005 for ; Mon, 7 Apr 2025 04:54:13 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 668861410CB for ; Mon, 7 Apr 2025 08:54:03 +0000 (UTC) X-FDA: 83306635566.19.4D1FE06 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 1D01A20009 for ; Mon, 7 Apr 2025 08:54:00 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KaejU2XD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of toke@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=toke@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744016041; 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:dkim-signature; bh=5WJqVyIiRiHobOpur+wy+jXWSRXJa9tRe2+r4vy9FyE=; b=smfMMnHfg8gxgdmDIZiyaOrkM1/U6egYr1ZoxtSlR4naDwpgWUPzypv6AuhRXYzYAxjikl WGiHhwmtpV5HQx4lAT1ynDhVoSXVZPnJidVKvrme3F00iHFuyJ14+ivknH4NO259TwBHN5 yhxoLZKpklAQQOol7FCOKuHf+7r35wo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KaejU2XD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of toke@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=toke@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744016041; a=rsa-sha256; cv=none; b=p4A6EyuLCcfOCAJAQSjZFJLOPDntB3DxqHA0r6gFYM8j7SdWC+N2EoaTZg0e1RVlEXMDPu ijSNrfsF3WHdYB+3fAVhIbt28fO8TG139NkXOnkTPOQpOggtK+eqSZCYVDE6YiTeIJqLnQ 8aryJWGsSHIBK6ivRQjS2WECmv5gNVw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744016040; h=from:from: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=5WJqVyIiRiHobOpur+wy+jXWSRXJa9tRe2+r4vy9FyE=; b=KaejU2XDvPipy1HHE/bJkfMvNBczMHtFmZE08pe3bzP5OseA0g/96qUM8GnCzPCD9XUTwX LtjWfJBu3XrsJCn2KJE5q37AmOWitClLh3jfD9BezOuBHtuU55eb8OCDz+SiDmJqnChgOH 1FEcErANat0dfSu+Yj9kRsmhHjLK6uM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-oP3p2HaZNoqDeLox8nE1bw-1; Mon, 07 Apr 2025 04:53:58 -0400 X-MC-Unique: oP3p2HaZNoqDeLox8nE1bw-1 X-Mimecast-MFC-AGG-ID: oP3p2HaZNoqDeLox8nE1bw_1744016037 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ac297c7a0c2so320723266b.3 for ; Mon, 07 Apr 2025 01:53:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744016037; x=1744620837; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WX08fMyjATa1UCoVjYCNjOKyQjVIMz6mY8L2vI8owLs=; b=hYDQKFq5DjyFSRpaU86CX1Wh5/J9nI+hPPLrp4GJoQdct9BXBAPzi7j1W2290VgMSf pK8CvtoZFha2HGgFTTNXg/zLadff3EAIg5jmb0+GBQnQVhN/goKNb+x2lI6riaj9Pmxp AJv8YA6lY3MgjOaWhGf1DeJAsuScVj22GVZ4yWn2B4w8VYW2YS8ar13E8y9DmKaL4OEQ IBd6KR6+uVcSzZHuKSxIBYiHOTxKzXYify7e0GPOl7t+m59wQgpYYl2yw7NcJTnapj9P vGtWUDK6dvya7MUWylZ+XyFhz8uCNiSVs3QpwWFiWHn6X5BfTR4izw9663vNaQ+582Bm QeaQ== X-Forwarded-Encrypted: i=1; AJvYcCWOQXQfzmFG/SfhX1dQY6cYnS3kPyEG8ho4tG+s/GL2PlF4bwOuuQpHmO8TkJ9pKwShix4ZDLG2VA==@kvack.org X-Gm-Message-State: AOJu0Yx1CCrR33BraoKXF2QvazAXSqgVlCvfWcGFgEQnojH8IUvxrxfB oSszycmvd+t7gyuftx+2G7BpQg75Qb+jIr/rf6GkNS+nXKij2Y36S+l5GhyYjKLUnJ37kzXqGTt LlDSvpiuqZiVhB74946RN2LK5iaePtyid+3GROK9xH2Bn5YNG X-Gm-Gg: ASbGnctDSg+br9FeW1HtRkzJRvmu3jCYzPMUtEMsudIzdhMz8se1xWBu2FCZ2tVbp9W n1bYS/ZU76CeAAaXGi2Ky7LdxqCPVQeKoeUqho+wXZ9gKfOepjaBvGyGhOQLZYDZ+ZdCraUXK9G DfyhoyVi93GeI9qlLl1Q758HsBlsx1b1EJrzB8awbRnlc3uuPyZeNq8CwkIlGcRggxv59pFss3L lNjSD2vm9XSKRkNwOs7o5Cl/dhCUyTEzj4IbevixYRTl/aV0bmHYEsaLx6wxaUpSE0Hr3m9z2Q8 2NJNks4JZZwkxBTRcZzQCoK4VUAOwZDawHTUXzZz X-Received: by 2002:a17:907:60d1:b0:ac2:66ff:878 with SMTP id a640c23a62f3a-ac7e77b48afmr787964366b.50.1744016037496; Mon, 07 Apr 2025 01:53:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVb33+8wF4lK6cnuu9f4nRUChR41f7hK0+8LtHxpAhi3vaXbXMmuVF5DNGsf7Ha6IvN6oWCg== X-Received: by 2002:a17:907:60d1:b0:ac2:66ff:878 with SMTP id a640c23a62f3a-ac7e77b48afmr787959466b.50.1744016037067; Mon, 07 Apr 2025 01:53:57 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7c013f71asm706325866b.112.2025.04.07.01.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 01:53:56 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 521BF1991859; Mon, 07 Apr 2025 10:53:55 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Zi Yan , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Andrew Lunn , Eric Dumazet , Paolo Abeni , Ilias Apalodimas , Simon Horman , Andrew Morton , Mina Almasry , Yonglong Liu , Yunsheng Lin , Pavel Begunkov , Matthew Wilcox Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH net-next v7 1/2] page_pool: Move pp_magic check into helper functions In-Reply-To: References: <20250404-page-pool-track-dma-v7-0-ad34f069bc18@redhat.com> <20250404-page-pool-track-dma-v7-1-ad34f069bc18@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett Date: Mon, 07 Apr 2025 10:53:55 +0200 Message-ID: <87cydoxsgs.fsf@toke.dk> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: DufNxfC5Q1dXrngjFWt9pxYgnMCVheCr1UUoZNrH7po_1744016037 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam01 X-Stat-Signature: 7kj875ire5k9mkkb5yattkot4atqfc6p X-Rspam-User: X-Rspamd-Queue-Id: 1D01A20009 X-HE-Tag: 1744016040-293029 X-HE-Meta: U2FsdGVkX19BV73FQ3gW/qw8Ez+O16ylHt7GNEA+wal5xXlx1JVDtTciBT6y+HUEKbnMELrYvkBC25nRK7BYLxenksL3xMHS85uwgbvcXh0lHaWL8O2i6k+NMz1Jv61WaWYd1CEUOiPinGO5wHDQerofBOIjxGrAQdpHScR/MEnISMo33uCbEtQQa5wdn7kcumzskxB8ukHAixz4WGI7yulY8NVot+XLuRlN5FMZk2Ma8eiIs9u0zuZxzaE/KdC5wHKrQiLYzXeMKmJlFLhrLHl+qC8D5BzRYvg2UggFPy9KmxUZdtBbnSVYkzDBI6wk3yoYCK6pXu/XoIN+d70NqLGA74AkqaydTggIP0Ll7/XTfxHPcfvsDc2ZKwQqRliV1HuH9okaMASMlWPOnqFaMaxVH0o8w40nxiJYdtSWuaNt+4DqitxZpqe4/rwyQ2fjlRJZzBUsQxaCIFdX4ydyuVyvcyzvpOqwoJLw9C/c/oWK2Rqf+Hy6hZQzLXs3E4wS85N/a437JEegQjW/mv6bYOKo/HRatpDHBXh4aNoFl0jGy18nBXXTCebogYDi/lXMPDGoPknzNOmHjGFY6iZEtuqhm9cNIcOtSu3jIybBVzNgE+2OLXR1UhsYtgqFbZiQhX09DfCUSCkoTVoFtTr+Fmi2fx98NRPHKHeLQHiA21aj2k5A0WdpuNdc3uJAIO9HM5SG1tL3++DgVeqR6Sj5Cgx1DLvZCy4WeXUlm5OhTiv+aMMMMjAxbHpmocM4RBfaQA90BMKDQeKB8LAHDWmExiLyk1KrVL3YuwV86n5q4X2R5EAT6e+Egpnmayg1I1fi3B+bKTYHPiK+PjKegRLmLQtHsTMtHUGWDBB5W1PsHgeR4xLADykda00EVrKqy6SRAbw04mc43krDQdGy4lo1kwh7IGh2SMoDWOl60+cG97VcjDnGV0SF8HjUkW1mzlF2k7JOKbc8dakYyWxQW+u 1oBgIc4T +PCP2Gl7WBHmMzz4zLKXTXZwylAnjhrAmSOvp3kattiHTBbHAUk8SGaBZaTlU3RENAdO7pjv5vt6RGjLzv6++MLRitXJyRTKYjnGb9oosueFf+NHs7y89egRltgKtj1/7Bhp/C4tvWZThCdo53xron4XpS2RshVQ4BfbyPUMnviBMPIi6p1YGa2jY0hx+Utj4uoXJx9zpjReUf7L2ZWrC3nA2D5/fvCCzlWnp4ndvHzFIBILK6CDaEN0VCNiWy2GorV6tNPKBV4h5akDsSTTNQxsHhGX4o3rqBJ8+dvhJLQagFIRAojNUojmdO/9qwdPuKg+7o1Otec7SUDoW9413J+fA1Sb8NYAnY/zNPtM55zygpNbZCs3H/JED2r1hWmoVJe3x3rhV57e0sbbbUCYRM4bb3w2YK6OHn+yptQRazxdNi/IxDQ5ocIrGSBOrOIoIWDhj13GvnxCG7M+UhfmgfcwvZDXb2xClkYA9/eNTz7jJi2OC5yz9Gfpd2XecZKeTE0I346cn54WHEZxixdksb54GkeQvXJfkxgtWvCuzTWHO3/K/K7D2azMDUqXg4ShrxYUuE+C52gBVabxj6UMC9ZSvQRilbMMFYb0eU6LCy1WmhrcZU5YRcjcdo9ZgTtqAkBtJmo2efX/NeQGSR3T2uyzRRfZ/SAfP3paNpA08krCNP/Hwr/E+wCKcizFNbRRPJ90OJAcERLmzFOY= 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: "Zi Yan" writes: > On Fri Apr 4, 2025 at 6:18 AM EDT, Toke H=C3=B8iland-J=C3=B8rgensen wrote= : >> Since we are about to stash some more information into the pp_magic >> field, let's move the magic signature checks into a pair of helper >> functions so it can be changed in one place. >> >> Reviewed-by: Mina Almasry >> Tested-by: Yonglong Liu >> Acked-by: Jesper Dangaard Brouer >> Reviewed-by: Ilias Apalodimas >> Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen >> --- >> drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 4 ++-- >> include/net/page_pool/types.h | 18 +++++++++++++++++= + >> mm/page_alloc.c | 9 +++------ >> net/core/netmem_priv.h | 5 +++++ >> net/core/skbuff.c | 16 ++-------------- >> net/core/xdp.c | 4 ++-- >> 6 files changed, 32 insertions(+), 24 deletions(-) >> > > > >> diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types= .h >> index 36eb57d73abc6cfc601e700ca08be20fb8281055..df0d3c1608929605224feb26= 173135ff37951ef8 100644 >> --- a/include/net/page_pool/types.h >> +++ b/include/net/page_pool/types.h >> @@ -54,6 +54,14 @@ struct pp_alloc_cache { >> =09netmem_ref cache[PP_ALLOC_CACHE_SIZE]; >> }; >> =20 >> +/* Mask used for checking in page_pool_page_is_pp() below. page->pp_mag= ic is >> + * OR'ed with PP_SIGNATURE after the allocation in order to preserve bi= t 0 for >> + * the head page of compound page and bit 1 for pfmemalloc page. >> + * page_is_pfmemalloc() is checked in __page_pool_put_page() to avoid r= ecycling >> + * the pfmemalloc page. >> + */ >> +#define PP_MAGIC_MASK ~0x3UL >> + >> /** >> * struct page_pool_params - page pool parameters >> * @fast:=09params accessed frequently on hotpath >> @@ -264,6 +272,11 @@ void page_pool_destroy(struct page_pool *pool); >> void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(v= oid *), >> =09=09=09 const struct xdp_mem_info *mem); >> void page_pool_put_netmem_bulk(netmem_ref *data, u32 count); >> + >> +static inline bool page_pool_page_is_pp(struct page *page) >> +{ >> +=09return (page->pp_magic & PP_MAGIC_MASK) =3D=3D PP_SIGNATURE; >> +} >> #else >> static inline void page_pool_destroy(struct page_pool *pool) >> { >> @@ -278,6 +291,11 @@ static inline void page_pool_use_xdp_mem(struct pag= e_pool *pool, >> static inline void page_pool_put_netmem_bulk(netmem_ref *data, u32 coun= t) >> { >> } >> + >> +static inline bool page_pool_page_is_pp(struct page *page) >> +{ >> +=09return false; >> +} >> #endif >> =20 >> void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref ne= tmem, >> diff --git a/mm/page_alloc.c b/mm/page_alloc.c >> index f51aa6051a99867d2d7d8c70aa7c30e523629951..347a3cc2c188f4a9ced85e0d= 198947be7c503526 100644 >> --- a/mm/page_alloc.c >> +++ b/mm/page_alloc.c >> @@ -55,6 +55,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include "internal.h" >> #include "shuffle.h" >> @@ -897,9 +898,7 @@ static inline bool page_expected_state(struct page *= page, >> #ifdef CONFIG_MEMCG >> =09=09=09page->memcg_data | >> #endif >> -#ifdef CONFIG_PAGE_POOL >> -=09=09=09((page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE) | >> -#endif >> +=09=09=09page_pool_page_is_pp(page) | >> =09=09=09(page->flags & check_flags))) >> =09=09return false; >> =20 >> @@ -926,10 +925,8 @@ static const char *page_bad_reason(struct page *pag= e, unsigned long flags) >> =09if (unlikely(page->memcg_data)) >> =09=09bad_reason =3D "page still charged to cgroup"; >> #endif >> -#ifdef CONFIG_PAGE_POOL >> -=09if (unlikely((page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE)) >> +=09if (unlikely(page_pool_page_is_pp(page))) >> =09=09bad_reason =3D "page_pool leak"; >> -#endif >> =09return bad_reason; >> } >> =20 > > I wonder if it is OK to make page allocation depend on page_pool from > net/page_pool. Why? It's not really a dependency, just a header include with a static inline function... > Would linux/mm.h be a better place for page_pool_page_is_pp()? That would require moving all the definitions introduced in patch 2, which I don't think is appropriate. -Toke