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 DC757C36008 for ; Wed, 26 Mar 2025 15:30:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6AD00280090; Wed, 26 Mar 2025 11:30:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 65A5A28008D; Wed, 26 Mar 2025 11:30:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4870C280090; Wed, 26 Mar 2025 11:30:30 -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 1178C28008D for ; Wed, 26 Mar 2025 11:30:30 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 476761CB15C for ; Wed, 26 Mar 2025 15:30:30 +0000 (UTC) X-FDA: 83264089020.13.CE884B1 Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) by imf13.hostedemail.com (Postfix) with ESMTP id 8494620014 for ; Wed, 26 Mar 2025 15:30:27 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=m8Y599BI; spf=pass (imf13.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.219.176 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743003027; 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=1tp8PX3VrlT3xj5/bJFgA5hrm+xCmQXv7oRpmonMlOI=; b=idR5awTaiwXwHI3pYAN0/cBE1Rl4NTHWMpv8wsa/aF0tEjZ5HHWomjtSp9Qg/mYOVMmSaW vvuczll/FaR6X02PCNUsOdYCqfhqdhWPlyhTmjYpK/P/Vb2yRMNc+PBigimc/qU9Dv803Z hyRy95OQKmA5RTFPVlPN5kaHePvfP4o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743003027; a=rsa-sha256; cv=none; b=wI9URxfaQqOHA6Q8Ywh/mXSpRCeeX6/xCqf34Bx9HFotDu3Bag+2V1ENQIyBLfUSYGTJz4 /yEW4bzITr2QFw/PXRSIESjCiBCrZ+7+EIjVj9HRne9dNQOUIPTXafKC74wZhONf0JDgwq /aruw3L3VsUW2/q0H4qgmnNZBjPUEW4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=m8Y599BI; spf=pass (imf13.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.219.176 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org; dmarc=pass (policy=none) header.from=linaro.org Received: by mail-yb1-f176.google.com with SMTP id 3f1490d57ef6-e5dc299deb4so8964276.1 for ; Wed, 26 Mar 2025 08:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743003026; x=1743607826; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=1tp8PX3VrlT3xj5/bJFgA5hrm+xCmQXv7oRpmonMlOI=; b=m8Y599BIosyFyYFZ2GtF3IyY/sB7AzzviVFoswuCojW5T5t4Ym7hTfwJmdnUnZ+MO3 uOVcfyO3/KDh+UGL178rXi6TUjbbdq6sBMpSKI14P+n5mu8WaiO6Vvq8cwYl3ooWLIow oHR4V43f85ZfOaGBobmXmwZmK4Q8uikAvDPWzY2duSEfF9zVvCqyjSBDJnaK0WFpDp9S Ot6GElFG8KJaMIZjskfdKq3LMvj4YtGIbLQl3NV326TNaXqfCBbYw/in3JtLwYSnWdKQ qaHGU5wAIVG5aymg3PXQGXylrfc3k5NUX8cyXQxdH1QdKd4J7mrtIWu21gEaYpueFURM +3Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743003026; x=1743607826; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1tp8PX3VrlT3xj5/bJFgA5hrm+xCmQXv7oRpmonMlOI=; b=a1oX+alKH3rbshxQY2j05ZlkBKPcbY04rO6XdbFZHwdw0HgtDoq47fZJj48ers6v/Q k0VmFTXz8REUZe08MCmZI/0NjoCJoci8sxOaoi5vqEPRFDyrfbtdhpu+v/KgDQjIS6E2 NOayQYUQkTCbLiHU3+ODxqE3KxQ5uxlsvc4ohghxPv1qtu6WgPXM7ksw98Wls5xd4Q8i CQfFUlUC6zfc6GAY/sIhL1g8c1/bLvJLfMxlo/d9fXRnAH4Bx9fZXwtfHc8rqNQFz5VU oEAPBXJCSAf0seT+5+WC5UTJiDOBJH71dc6vud13YQ71bfQt+XndGMJQopaIHFDqM78j Mr7w== X-Forwarded-Encrypted: i=1; AJvYcCXFAR8KThBCYMzZUF7PKPpaBgC8yOb63nECj97Ddjq7sHtKD42ZeimQeJLiix/Aj81oAr55GjGhqg==@kvack.org X-Gm-Message-State: AOJu0YyyR9yXu4Nyn9sdDRCHwwoLE0LGTkHgWpZ2zsPhRsgbBmdgiafD 4NHHu3SJd4rZAGpkUiP/oK0/3nT6rAQ73mj4JrBc8IYjylL+guLjEXl0WhcLHYQyKRIQ4B6MgaI WYapjl8quvBs4RLlK55tseTch/vuUhlgfvDYTEw== X-Gm-Gg: ASbGncsFz7olNNFlvFxUxogTCsc07aNsvNKs3sW6txu1pvDXsv+8efOxIwJI+TLiQwu BDDhFHEGaW7l/alkarB3flu3BnC6SzJt/qEDQ+stihpaonA0qXgjeuLTa1p+KrbM+iYrQQJH+ld wu6Y2eVcCkfPib96zpIO1BFsTernw= X-Google-Smtp-Source: AGHT+IHH8roGtvYn4zIkkHyeZONRNkqexqeYCf0x2L8a8OYlH8Bn8/yS0J4dIX1ClKxWSBASDFTCClZLBfb0+pTFgfY= X-Received: by 2002:a05:6902:228f:b0:e63:ebc9:656 with SMTP id 3f1490d57ef6-e66a4fa21e2mr25381574276.35.1743003025980; Wed, 26 Mar 2025 08:30:25 -0700 (PDT) MIME-Version: 1.0 References: <20250326-page-pool-track-dma-v3-0-8e464016e0ac@redhat.com> <20250326-page-pool-track-dma-v3-1-8e464016e0ac@redhat.com> In-Reply-To: <20250326-page-pool-track-dma-v3-1-8e464016e0ac@redhat.com> From: Ilias Apalodimas Date: Wed, 26 Mar 2025 17:29:49 +0200 X-Gm-Features: AQ5f1JrJyBnSFqybq6WlsgbDPnbPbzUh4cR4XN8mgb-NDuFNFyPbV6xmXGZAU5M Message-ID: Subject: Re: [PATCH net-next v3 1/3] page_pool: Move pp_magic check into helper functions To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Cc: "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Andrew Lunn , Eric Dumazet , Paolo Abeni , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: ui1ttytcp8w78zh3iitcjb5ia4nppfan X-Rspam-User: X-Rspamd-Queue-Id: 8494620014 X-Rspamd-Server: rspam08 X-HE-Tag: 1743003027-271968 X-HE-Meta: U2FsdGVkX19LH+OlfRR8vUCLfJT+cAl7uWocLdDmjjKtud0uUneda6ZnsOKrisLLzu8QGjtQXLu3UWwzbwzI5k9j4cuywQNYWlbK16jcg0Hk3NKXvZSF1qyGgueJ96zGxTSoe8XG97kO94kpoSJY9HzikxO8+TGxfBrRil5Ic+xKOHqulyJjcHGesFl5Ovi+pjN09efapdPMZ9Z5Fb/l0MWad5jq6ORlvNtSFPqQ91Z9ty0FoOECwX9699aMg4zDLi6i0+nJ6Vv6220nUkeEdbKFaYYp5IgqyEfGBB2M8peQKxlRs8fYnNDwny/0mKtvwjZMRXAK1JWObOSu6EvEWS10yyKztBSrY/YYbMGIt85BfNFDI07P5BcKBm1xVcucxW76Pz6fs/C0cVmtpMzomAVoEO+hh5XbfzkqLjWhQaxHZhKXbYtWu8FwEQfQqo5IUnRGbd6SOldUfYQeeD4MmUvstQR3cUtqA2ktK1wgpyQEJzWkVK/Zibit3hahSnLSifPUAjhOJeJNpf3I/k964hdD//DONiinPncUO5klVSO5HTypVrnUYzS2kRxwkKNj+ipN2lrMaOKiCLDol+VzW1/jgtbBuGpzMjDACIb0F3zsbNKZwraAXK3B9AJkgQPE2dsaKZkgGhtActZgwyRuXr5GAN4iQV4ksDgbYcOcvPrtromdf8vVZwe0wU8GY4BMj4RmEqHGpoMoMjCA85/lLFnRxS7SU9OoNral3qzF+HGjLVegqipSmbN9ePiiYn7QwC4y7H6qIepBmCBUMTluiYFo/D6ZmsPwwkQBDrlmpUY0eR+DOQiYVlxs1UBzxs8jAy/lt3RvemqNBEFY5kVSb/6LF48DkJLAozLHLkQEuSjOzcNsNoFVrpnHD0jk/dvEJUuLI8vUybHLNwBInbCpwm5o7fh/pO/msSn8oI+ZdBz0QglttnYNErh06laXe0xfFVx5qaI5oAq1gDHFxQM KMcoCJXo LQcY6xs774R+EfqzVPKIDV76LVVG/3sMOWfTf7Uwn7sBFj9SFdRojCu6r7ru9C/RG48gbXhWwOgjS39DfbjCue92c71FWG1idXkuvqrjDpMw9aBdIEdN9sat9DYlVNcyFI7kP+y0oEyjuvx9/JhBuivVXIDubpZR7zwo5RqAb0D4gPW8/pIrXeJ73EocwX/JqaDaRRuxur3/rcFp+WTzSZxWri8b9uWUy1tWFgdEU22rzi7UnzoED3aQBMBGNIZI2S20t973sFEov8zOMiAbCzOQ2HkxiJQOwUFYFgx1i9d5mVDwiVe5CinmanIhtil3+WhP+HiNCljcMv9Rwge4expAcib7sXKVB4syWiewGVLX7pxXKo2qyrFxmu3k4T96+zrO2w46TSt/YLQdAYbEugnQmTs8sodU/rO88d8WjySD9PtOm7yIleUv+snRT31DwD3KT 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: Thanks Toke, On Wed, 26 Mar 2025 at 10:19, 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 > Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen Reviewed-by: Ilias Apalodimas > --- > 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/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c b/drivers/n= et/ethernet/mellanox/mlx5/core/en/xdp.c > index 6f3094a479e1ec61854bb48a6a0c812167487173..70c6f0b2abb921778c98fbd42= 8594ebd7986a302 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c > @@ -706,8 +706,8 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq = *sq, > xdpi =3D mlx5e_xdpi_fifo_pop(xdpi_fifo); > page =3D xdpi.page.page; > > - /* No need to check ((page->pp_magic & ~0= x3UL) =3D=3D PP_SIGNATURE) > - * as we know this is a page_pool page. > + /* No need to check page_pool_page_is_pp(= ) as we > + * know this is a page_pool page. > */ > page_pool_recycle_direct(page->pp, page); > } while (++n < num); > diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.= h > index 36eb57d73abc6cfc601e700ca08be20fb8281055..df0d3c1608929605224feb261= 73135ff37951ef8 100644 > --- a/include/net/page_pool/types.h > +++ b/include/net/page_pool/types.h > @@ -54,6 +54,14 @@ struct pp_alloc_cache { > netmem_ref cache[PP_ALLOC_CACHE_SIZE]; > }; > > +/* Mask used for checking in page_pool_page_is_pp() below. page->pp_magi= c 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 re= cycling > + * the pfmemalloc page. > + */ > +#define PP_MAGIC_MASK ~0x3UL > + > /** > * struct page_pool_params - page pool parameters > * @fast: params 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)(vo= id *), > 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) > +{ > + return (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 page= _pool *pool, > static inline void page_pool_put_netmem_bulk(netmem_ref *data, u32 count= ) > { > } > + > +static inline bool page_pool_page_is_pp(struct page *page) > +{ > + return false; > +} > #endif > > void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref net= mem, > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 542d25f77be80304b731411ffd29b276ee13be0c..3535ee76afe946cbb042ecbce= 603bdbedc9233b9 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" > @@ -872,9 +873,7 @@ static inline bool page_expected_state(struct page *p= age, > #ifdef CONFIG_MEMCG > page->memcg_data | > #endif > -#ifdef CONFIG_PAGE_POOL > - ((page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE) | > -#endif > + page_pool_page_is_pp(page) | > (page->flags & check_flags))) > return false; > > @@ -901,10 +900,8 @@ static const char *page_bad_reason(struct page *page= , unsigned long flags) > if (unlikely(page->memcg_data)) > bad_reason =3D "page still charged to cgroup"; > #endif > -#ifdef CONFIG_PAGE_POOL > - if (unlikely((page->pp_magic & ~0x3UL) =3D=3D PP_SIGNATURE)) > + if (unlikely(page_pool_page_is_pp(page))) > bad_reason =3D "page_pool leak"; > -#endif > return bad_reason; > } > > diff --git a/net/core/netmem_priv.h b/net/core/netmem_priv.h > index 7eadb8393e002fd1cc2cef8a313d2ea7df76f301..f33162fd281c23e109273ba09= 950c5d0a2829bc9 100644 > --- a/net/core/netmem_priv.h > +++ b/net/core/netmem_priv.h > @@ -18,6 +18,11 @@ static inline void netmem_clear_pp_magic(netmem_ref ne= tmem) > __netmem_clear_lsb(netmem)->pp_magic =3D 0; > } > > +static inline bool netmem_is_pp(netmem_ref netmem) > +{ > + return (netmem_get_pp_magic(netmem) & PP_MAGIC_MASK) =3D=3D PP_SI= GNATURE; > +} > + > static inline void netmem_set_pp(netmem_ref netmem, struct page_pool *po= ol) > { > __netmem_clear_lsb(netmem)->pp =3D pool; > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > index ab8acb737b93299f503e5c298b87e18edd59d555..a64d777488e403d5fdef83ae4= 2ae9e4924c1a0dc 100644 > --- a/net/core/skbuff.c > +++ b/net/core/skbuff.c > @@ -893,11 +893,6 @@ static void skb_clone_fraglist(struct sk_buff *skb) > skb_get(list); > } > > -static bool is_pp_netmem(netmem_ref netmem) > -{ > - return (netmem_get_pp_magic(netmem) & ~0x3UL) =3D=3D PP_SIGNATURE= ; > -} > - > int skb_pp_cow_data(struct page_pool *pool, struct sk_buff **pskb, > unsigned int headroom) > { > @@ -995,14 +990,7 @@ bool napi_pp_put_page(netmem_ref netmem) > { > netmem =3D netmem_compound_head(netmem); > > - /* 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 > - * mask those bits for freeing side when doing below checking, > - * and page_is_pfmemalloc() is checked in __page_pool_put_page() > - * to avoid recycling the pfmemalloc page. > - */ > - if (unlikely(!is_pp_netmem(netmem))) > + if (unlikely(!netmem_is_pp(netmem))) > return false; > > page_pool_put_full_netmem(netmem_get_pp(netmem), netmem, false); > @@ -1042,7 +1030,7 @@ static int skb_pp_frag_ref(struct sk_buff *skb) > > for (i =3D 0; i < shinfo->nr_frags; i++) { > head_netmem =3D netmem_compound_head(shinfo->frags[i].net= mem); > - if (likely(is_pp_netmem(head_netmem))) > + if (likely(netmem_is_pp(head_netmem))) > page_pool_ref_netmem(head_netmem); > else > page_ref_inc(netmem_to_page(head_netmem)); > diff --git a/net/core/xdp.c b/net/core/xdp.c > index f86eedad586a77eb63a96a85aa6d068d3e94f077..0ba73943c6eed873b3d1c681b= 3b9a802b590f2d9 100644 > --- a/net/core/xdp.c > +++ b/net/core/xdp.c > @@ -437,8 +437,8 @@ void __xdp_return(netmem_ref netmem, enum xdp_mem_typ= e mem_type, > netmem =3D netmem_compound_head(netmem); > if (napi_direct && xdp_return_frame_no_direct()) > napi_direct =3D false; > - /* No need to check ((page->pp_magic & ~0x3UL) =3D=3D PP_= SIGNATURE) > - * as mem->type knows this a page_pool page > + /* No need to check netmem_is_pp() as mem->type knows thi= s a > + * page_pool page > */ > page_pool_put_full_netmem(netmem_get_pp(netmem), netmem, > napi_direct); > > -- > 2.48.1 >