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 5254DC36010 for ; Mon, 7 Apr 2025 13:14:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 893256B0005; Mon, 7 Apr 2025 09:14:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 842136B0007; Mon, 7 Apr 2025 09:14:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E2B96B0008; Mon, 7 Apr 2025 09:14:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 47D1C6B0005 for ; Mon, 7 Apr 2025 09:14:13 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CC1C21A10DE for ; Mon, 7 Apr 2025 13:14:12 +0000 (UTC) X-FDA: 83307291144.22.7C9D39F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 62B5E80011 for ; Mon, 7 Apr 2025 13:14:10 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OJpyOyCu; spf=pass (imf02.hostedemail.com: domain of toke@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=toke@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744031650; 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=2ZCVf2ttaPZ7s3/Fu+i3jXBmtnG01Gulx1S/vtsOycE=; b=L+POaEkTM2A2Ej73YwuzIcR1kFiOfcVyTTHIkn1uzS3JH7oag+7ZLAsHx7//S7+WokyfVy ulPhKKo2nyFzpkoTBfp21wdhRZdUSRpnRj0IY9WPv2l+rFodFz3Jr1/n51zzyzbUGqtKgI 9+Al2xAXf3MUyh1c/ig6HUuIHEa3rw0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OJpyOyCu; spf=pass (imf02.hostedemail.com: domain of toke@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=toke@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744031650; a=rsa-sha256; cv=none; b=DibisHznNz84lyilixh8HsKyP1KmJyaBFdmBFihYOAd9WYBbcNjoUsM+gStqbbx30QKqgv vYz7ejX27/7VUfwWWZt2OVeMN0KFRJwZ8AgOs3NLDfaWE5g1kcbQUAtD8y/wPt49wMR4dz XSg3kW687xa/1lxaIMXMknA4hxjGhAA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744031649; 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=2ZCVf2ttaPZ7s3/Fu+i3jXBmtnG01Gulx1S/vtsOycE=; b=OJpyOyCuJOMrcB59W+lSTbWo0Ii4QGe4sRHZwNv29lFDqKa3p4HQmryceAz21IYOdl5FIs lQ+wPCMzJ8vDidPlNEMVC+Mxr7+HBBfmSHGkyRVjrFqcsPSaft1iQthyVPSuGOWKfNNm+Q mehxUqBdCQ+FI0KPJQ545r+czKy+Bmg= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-JYi8ESA8PKibc5g531-Arw-1; Mon, 07 Apr 2025 09:14:08 -0400 X-MC-Unique: JYi8ESA8PKibc5g531-Arw-1 X-Mimecast-MFC-AGG-ID: JYi8ESA8PKibc5g531-Arw_1744031646 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5e83e38d21aso4488794a12.3 for ; Mon, 07 Apr 2025 06:14:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744031646; x=1744636446; 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=OllSiN0eUkcOVIrXz329Q1Mf/3+77Twh9+vlNXCNGXM=; b=xIItCYYUz69wnsrs7he2xaHKQ4B2zsSyscvDsuajQlylLiaH/1EaSx7P0TrBJw9sr0 tVy/LWD5CLR/zqG9cnwIuhsHzWKC3Tl0mysbf/3HxmJXRpiNqRBESTru88Lsm4jZfmQM LD+CphYTsLQuOdFZlxOS4bXw1qCLEy6cqLTdxNOgJfJ1eSPrFRN4PzFt6lWQVugP2wZf ALv+GeWjg5vIyuLDunbSa45VrdTZZFeGibJlHN/0kDBRegrFoKoakn0Dzum4vflAOEOX DbawdLtJBmMn41XvXXoasSPksqDlJ5Toi0ir1Gm+Tjg2LhnCwQ63tnmozG2m0SFkaoBB 5H6A== X-Forwarded-Encrypted: i=1; AJvYcCVXj30CGXRBKtJcdJTa1yZXVPwzWBM7yt+oLHtyt/Buu8O8s0HDpp6f/q8gRnOkt55or9RP/shC8g==@kvack.org X-Gm-Message-State: AOJu0YyWH6eEZais508tgqDsKfBB2O3krMmuoZNMiD2lYuYrDnUt8ZsE TOGV9aHWcbQK2pmVdYvi9qdxfn0hct1o1VGv83SGcHxU3sa3uFKRtZC0ANC0JR+l7rgEYYk+apK +65hB2nTneJ2l5ku75oOPUdHBBcWw6x3ee+fz0o6NLKLddto+ X-Gm-Gg: ASbGnctX8vz94jHyhs3ehwqYi47aIuZLto92uWgVCJGDR1QPP71KpUqZ+jPP+zwUzVw VbIRXqLVYrmd86Zbh227vMXzS/X1mVSqD3qGyqICt4gvrL4O0DI0Uzdy9YUgSBGqSADxy9LoxWU 2mRQuMDa6xLtRCwV7xG6YfhihPIxG+ZcCzh0PcqtkaRsXhCA9Ym+f00RxsWNtQVScZP7zT+Xyd5 tWkte6TNo71kkCk3EPiT2/1QXkeIALmWBMIi27oJRf1lTdeJ17vkobADdsNr61kDGv6V3p53YIj EWY53aXkkSzM X-Received: by 2002:a05:6402:42cb:b0:5ec:922f:7a02 with SMTP id 4fb4d7f45d1cf-5f0db81b649mr6165666a12.10.1744031645904; Mon, 07 Apr 2025 06:14:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGavQJlmmghtqSg9iLbaBJHfh2I8uG3HzWNkv49MzKEgM7vcl9P3RYd3+0DSM+pvZQMRNiEeA== X-Received: by 2002:a05:6402:42cb:b0:5ec:922f:7a02 with SMTP id 4fb4d7f45d1cf-5f0db81b649mr6165640a12.10.1744031645440; Mon, 07 Apr 2025 06:14:05 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f087f0a9c9sm6969011a12.41.2025.04.07.06.14.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 06:14:04 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id C40FC19918A1; Mon, 07 Apr 2025 15:14:03 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Zi Yan Cc: "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 , 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> <87cydoxsgs.fsf@toke.dk> X-Clacks-Overhead: GNU Terry Pratchett Date: Mon, 07 Apr 2025 15:14:03 +0200 Message-ID: <87v7rgw1us.fsf@toke.dk> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EWe8lDOA5G6slfF4XWfMzjxyRu6LTr2VaKCHzwrrmtM_1744031646 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 62B5E80011 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: jpuwo48bkyhzu6kiwu844pnhcmrjpw8g X-HE-Tag: 1744031650-106685 X-HE-Meta: U2FsdGVkX1+qedg6jXKH1nbdXWuHZawEEvj2LFfe2y5oQOPeGbk/e4aQqXU/OyTo76E98FlG7PPd5bkwJ9NG6eFMevgXTPRFkvD/+FE30fwwmC5sqIj3vdAzd7GEdB8qXEDJkwm/9IXnb3w8bzlQxWtGvwX8s9O7encjcBtRhnvLFd4sdGEAzvNaASDnBEKu6Wg771BMCfv5fOrrFxQisE0nw45AR+rvpE8yEF7NnAEe314MAxGYdZvAuNnCJt8cxNgNahdq8ZAK231LOnrQotV48IAp0xerO2OkeAnCPv3XWkLliFNIXkpfeNIkDnrpNYO/xTisAT0AS74kKSysPDAAkdQ0WqWC3cUwfIB5RHBC+mDOJdaLnpI7/XjRUC/lYt5EFQfS5CA8CzacGiVVKaderSD9mYbC6/d9QjJBeXBvc/QKAxSlCIUsagEU5m/H/SQU1w5R+hA4KsZ8HugvOeZAmCZpTBQRaFAGeWPWtyO7QQe/AjH3AUipVyMv+2eKefhTSoH6zi0pK7SE1epw0b5TglX4ry0cIk064NzgmAAy2WYMzdRxpFmZzej21pXwn25HEfIL15IwxhI1FCF955t3/pcPQ/4575Cs6k7TjHVCv5uWmoJKqGBj+N1QoNihETBQ5T1Cj/hYPX/ZZrgUAlrsntVe+XIrOh/pCFq+StmAchTfNyCO8KA3clr2TjcGzTwP2Cgz/H3vz4W2kccMAtnc4pKKDh8d6WY517cTdlAhPb29Ssve5QWye142gG41XbSYnOfCKwZzzsWgG0fqGoeoLz6UESmx8p0yiy9ecw/mgM+p/EcHU1TXyB7j1eMd+RhOnI/OLhc35xtDYgQxZQle40ohjRbQ/pY3J8Pc9urP+D8QMY/a1dyJ1aq9P+DSKaIByse/CI3xekQxYIkM4Fi5ZsPehUrkRKIFRLVDfKfKcjROYmRIzjK1r3QiifPaoZqSyNo67U70JRz1DwH ElIgqgXl iYJjP/oKPOz/PtJd/Sj3fOD303e06BjWFMJAz28HlkkpiVDe6/y40KgW564nceQMc1ic+OWFfPAOjL8wOeM15sHXTTiRzuDkr3+hkFGmDHqatwdzL/XmuxA6JDcgzP6kwxpSmd6cemNWBbQLtzg1honkfieud6QhP7Eepp3qdgOAsAdIRrNMpVDykUsjWvBctdNUQnn/mCiaox5348XIFiwnu6XZmr8oCSA7tmyDD2sRGQyN96CIUo4ET0ZUxYCF8XpF3NYYEcpSa+/1Oz0Nz1F1OTL9f1dvCxFBpV1GYwI8bu9BxkpQQ42qhEgkZUVzMQ9t6lGuJb8NheEwv/CxW37/gYAtRS8a0YbN7igvWOzYUScUQlDJpSUQptc09SnnJlqCQU2n/brgWRBWLYBOCD5xQShHs7mFJAWh3cnvh6Sd9KQkNZ7uyLxmfjanS3gPJfkwHyToA9FHbrFvSvn43pHZuSWVk+iGkgf/QFJ3MyWBc3x9Klzt9QXp7lRRywro5KClXsxUv2yhHESHQsfc92av6/Qqh4sWFeq7u9WiNGe7Z2Abbi6kiqDQhu8FBjHnNdxww3tIpe9fdH6lLrVZB51+xKZe6sTiWQyMDPeslSvqpLc1EpRwiwtOvhYc9ba8j//GhvJK8ZX8Hu7JreIPWQlai+Ua8JRJAxLsKJ3FGctpQSt1D8Si3ub4CymUks2spiuFy1D9Hjri3Z9TDEeIcUoVUy/63gLybcra7R6eh60NrzbtQx28rr8sDR9SbRnm52jwD 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: > Resend to fix my signature. > > On 7 Apr 2025, at 4:53, Toke H=C3=B8iland-J=C3=B8rgensen wrote: > >> "Zi Yan" writes: >> >>> On Fri Apr 4, 2025 at 6:18 AM EDT, Toke H=C3=B8iland-J=C3=B8rgensen wro= te: >>>> 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/typ= es.h >>>> index 36eb57d73abc6cfc601e700ca08be20fb8281055..df0d3c1608929605224feb= 26173135ff37951ef8 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]; >>>> }; >>>> >>>> +/* Mask used for checking in page_pool_page_is_pp() below. page->pp_m= agic 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. >>>> + * page_is_pfmemalloc() is checked in __page_pool_put_page() to avoid= recycling >>>> + * 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)= (void *), >>>> =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 p= age_pool *pool, >>>> static inline void page_pool_put_netmem_bulk(netmem_ref *data, u32 co= unt) >>>> { >>>> } >>>> + >>>> +static inline bool page_pool_page_is_pp(struct page *page) >>>> +{ >>>> +=09return false; >>>> +} >>>> #endif >>>> >>>> void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref = netmem, >>>> diff --git a/mm/page_alloc.c b/mm/page_alloc.c >>>> index f51aa6051a99867d2d7d8c70aa7c30e523629951..347a3cc2c188f4a9ced85e= 0d198947be7c503526 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; >>>> >>>> @@ -926,10 +925,8 @@ static const char *page_bad_reason(struct page *p= age, 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; >>>> } >>>> >>> >>> 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... > > The function is checking, not even modifying, an core mm data structure, > struct page, which is also used by almost all subsystems. I do not get > why the function is in net subsystem. Well, because it's using details of the PP definitions, so keeping it there nicely encapsulates things. I mean, that's the whole point of defining a wrapper function - encapsulating the logic :) >>> 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. > > Why? I do not see page_pool_page_is_pp() or PP_SIGNATURE is used anywhere > in patch 2. Look again. Patch 2 redefines PP_MAGIC_MASK in terms of all the other definitions. -Toke