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 12971C35FF1 for ; Fri, 14 Mar 2025 10:12:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BBDF280008; Fri, 14 Mar 2025 06:12:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 204D1280012; Fri, 14 Mar 2025 06:12:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CAB07280010; Fri, 14 Mar 2025 06:12:22 -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 927A9280008 for ; Fri, 14 Mar 2025 06:12:22 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 92F991A0DDB for ; Fri, 14 Mar 2025 10:12:23 +0000 (UTC) X-FDA: 83219741766.25.1AA5F8A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 59F8940002 for ; Fri, 14 Mar 2025 10:12:21 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=A2rtmMru; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of toke@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=toke@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741947141; a=rsa-sha256; cv=none; b=FDRwv5eO8Kpetke0cAblLBtj3Unxj1vcOGmRo96Ssj4tJZ4DmOe5nhIpUNrL+h7R+xVRKb AfP3CL3Lhq6ZB9UiH6oCd2C0YG5vBa2hmGaPwjD6+v4Q9DmSpnrafXgfHwM+Pt16EI53+x b9iT5OTOIud2n0jhEOtNQ02TWzeZ/Jk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=A2rtmMru; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of toke@redhat.com designates 170.10.133.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=1741947141; 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=ave2IjOyoZ2UosD/vzUXfIW4ywUrT9zR4dZ7jLrzKAc=; b=fVhrsUOI4792bF0WbGEznIMnC1uaU6MCXO20rSuShuSyKdxX2BCZquHyT7NgSnIkjuE6Pr LFrvVwmdERAhju7eK5bMHs1pnWfhfDSim74VzN44DPVKCIP295rasZfOYcmdWBreS+rTQe Q21UbcdSRQH8Nx4XFns3nK8fs2nu+Lw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741947140; 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=ave2IjOyoZ2UosD/vzUXfIW4ywUrT9zR4dZ7jLrzKAc=; b=A2rtmMrugjQglCy8L/VKTb92n45r6Wb0LJ6g51vHSM0JTJSj1K41CdX71FvCC7pz5LRKW+ fGDP2mVuFH5aoXUD8yvQloUdKG7qAtbKxrAQTO6M9QXtDZDIXmNr4RrDGHVo9gWAxuT3EI QRM4gGPeLKtE18LnpzRlsBaTkd8f1k0= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-G6rFo2eNPjS1jFfNSCm6Mw-1; Fri, 14 Mar 2025 06:12:19 -0400 X-MC-Unique: G6rFo2eNPjS1jFfNSCm6Mw-1 X-Mimecast-MFC-AGG-ID: G6rFo2eNPjS1jFfNSCm6Mw_1741947138 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-549927ec579so866004e87.3 for ; Fri, 14 Mar 2025 03:12:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741947138; x=1742551938; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ave2IjOyoZ2UosD/vzUXfIW4ywUrT9zR4dZ7jLrzKAc=; b=YIMl+nRKDY1ltEj07rkUYIVqPBHQUoceKekrD2HX39ucQDA12t+Si1RbEia6S/anqG BZWKOJUdlZkz11IazBb85qBpFTQpqb4j9wSdngX+/8Exdp0/2tNVI3msE9bETr0AyClq 0LuEbf/YTjjZ70BrFJKrEwZJKqELkNhIgNiqLn8QcYveoHFgXrEtSjMyT19xPdYlrQ8j vO+y3Zu8Mzh2LsnUab9AFL3QChjqa+QN5cj7jfpT3PmZBgETQ6JSJpZHvkNh+zC1WB/C O6DrtbWWu/patRpDbdP1AV9elNG4A7MdDFipKYnrL47igoiKC5PlyFsJxW+PimkK+SY8 Tqiw== X-Forwarded-Encrypted: i=1; AJvYcCUDVYjmz2rk0YpjGbtxGT/iYr2j4i8/N4x8hktSqHmxKdVK5pw4clu8hAy0VEyMIMl25DEnD80nvQ==@kvack.org X-Gm-Message-State: AOJu0YwuNKQKsbiAbQHHJNvyY0k+rHmy1UerjJNhfAhuQ5pVGFMrQ8lh 1SnFFiQ7inco6kZmKF0ht+MQZzfIFx0FZ4ciMqPNZmvNHlK+kFUmjjKvVujAty3kj74cwnoYXcf ALy1n/F8UDzriAraQqWeGpLDydPbef/UVlFP/mQVsJpDuSRtJ X-Gm-Gg: ASbGncsHQsWRTXA00VAwoAl5VeqDEpm3kfKQr6d6aBQ0FIZsmWIGPBp+rxvv34nVuen dx5/xwSKOjwx7ZmKH3Po99Kvr4QRU4TXJqMC/F5FOcdPctiivvQpnQ4kGV8VH7za+hfNNK2Losd fttMW1VgDZoHvZxWjoDuS+K48gnISwwlHbmKNlClW2I2pURuuIhBWp/AEoA7KxGgAL73A05Nkqo G3UVCj0KPd9OXs0T/0HWkcrpHUhpEGky/QvC6mTKF18axtOpK5XEaKKJeGj+vVAzRkGhFHYFWhl z9F74x8+fxNZmGOQa9dLZqH6dtfXU2frzpNkcxra X-Received: by 2002:a05:6512:10d1:b0:545:3031:40aa with SMTP id 2adb3069b0e04-549c38f209cmr513466e87.9.1741947137926; Fri, 14 Mar 2025 03:12:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHzxGfVA9udR6p6TQJwZ91X1aXY0n12wGHzdlM1JECrgnA89h9JnwLyeEXzDY94I1wIwwBIgA== X-Received: by 2002:a05:6512:10d1:b0:545:3031:40aa with SMTP id 2adb3069b0e04-549c38f209cmr513435e87.9.1741947137461; Fri, 14 Mar 2025 03:12:17 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba8804a9sm469301e87.168.2025.03.14.03.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 03:12:15 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 09C6918FA92E; Fri, 14 Mar 2025 11:12:13 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Fri, 14 Mar 2025 11:10:19 +0100 Subject: [PATCH net-next 1/3] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250314-page-pool-track-dma-v1-1-c212e57a74c2@redhat.com> References: <20250314-page-pool-track-dma-v1-0-c212e57a74c2@redhat.com> In-Reply-To: <20250314-page-pool-track-dma-v1-0-c212e57a74c2@redhat.com> To: "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, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Mailer: b4 0.14.2 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: msbXTZpwOzwNGvmBfLG2gBwn-Lu-FyAT8SemLje1sFE_1741947138 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: mxymk61359hyb8p1kmtxa3zzdiy8finz X-Rspamd-Queue-Id: 59F8940002 X-HE-Tag: 1741947141-211813 X-HE-Meta: U2FsdGVkX19ox4QRINhoXcpIkM/1ZOUYmnIncwuj7qnhcTny598EqavUoWUr9dniz+gXvtQ/yZeJRjeZ+tUyuPQ8bWftoGPEBTJlDbnbEhDxEgEQtZNXDCfgUZOobjl3A1n3nL+gtnB8XESdKECJGVwHt+JXSqVnATWjV23odoI770oWwqqbk594ovBWF3z3ubh1Dj9+6nrrPnwPhZZOCb7XMZ/fwXxLWc86t90ezxi0LTbGG8PFltkZ5UAQSOv64RNVIZhuL/rzJd2N0Lfx95qypu3y2U3Eu39+X1pnGJ7KSBfZob7z+tgsVTZ6MLsCD70jeY+hvkBA9zevuvG8rK8iRjO8LzdQEXx8p48ajiT4KVTTXJdAUz22SEKz52T51Kg4zEmLQP7ETaDO8yBukPlHa8U3S3vbh5SnjyN/Yxi5nXYw8JfFFz6WhdNtX4wOesU+ZrQyXqJBmScuC3DWMHe7nDc7RnUMNlwc04bo43/KshZXEhRgcfGsaJ1JusIqlJNY6QxkPac603EySDhyETFgfHITdYvqvtE4NtflIgOVbjv888iG1/aJkYvapvTBIDc5r0vWPEoug/CeEKzFSvd+fr1gLSMWVV1lQkV7XI2ODw5vm4YKeuHxsMNRuUCSTiZq1fbjs9KDC8RULEWgbc1+Kb77v6c5e0h0g1u/TvLH+LO6raKXTdiiqHu6TIah+JuNGWnp+/U7fdGaeEnd7ko3ThX+MmVT3d8K45jSVVqacntJkVUzBr2cknqNUAIpc4za1fjsK3Cmd65cc0et5Dtam/9MvVlA6xAHBC4KPeZqT+MkslxQAiPjV7JpXaNLlHFrS5iKR0izbWU5NFE/iy8qj77xkEb/nUwb+FSnv1vV/aV7LvV0XXvCkdoAaldvOgRv65BghcIyP6/EHirETmuTvtNFrrVjqYA3eeXKW/LyGmI39CRwtPZMXTbebtsvTyRAXz8xG4iQOXGvQy+ zJeBN5n7 RoBRSPEFlDai6dikerjwG5Ew9YYEAMsOGnn0aJ08LnY2s6u4GrI5RjJOHeOlnYwJFPK219unqlR5FPNCCSaGlKVK1wQLSFDQA2xq5AFxsO/X284hAfMZBWhBkKo3dtPzNU0+E7ilf31eVAJpuIci/uQ1IQ44fYCfS0MnUoH1MPWdQ/1JVNPUF/cak99B/wj4/MU6JT9YJ0p+b5DO1YwT7j8NSWYOMFl1dE1crvMg/sSv0vuuJXP750gZl8mhpnMom1oFQigC0fG9EDhRmCdufdftSMFCITDy+QIXszUP6bHv6m5DahYJ4mMsTZjTzdKHfFiLe+f16UXW+navzyM6E6ouvOetySTNVOgNkGsQAPC9DZ4O8bu5SHnfYlSsSf/H5Y99RRXA7ZL940irRTk8ISm9pW8y1iH2bm6xXfAsOD3eVkDDSa+e4qsz2i8okk/XCHNtzDJkIViURSkvk5KXoI+fU+Ylkdnuijn9bgkdqTO4JOf35+eS4FQJWljWria/tEGyYdq/RvnU8ZcqnYX1/97oIeaqmsbe4jr0szZosqxhM7gSuAWRMWRkwgSvZ6Mt1Pxd5NWIelDt/61Q= 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: 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. Signed-off-by: Toke Høiland-Jørgensen --- 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/net/ethernet/mellanox/mlx5/core/en/xdp.c index 6f3094a479e1ec61854bb48a6a0c812167487173..70c6f0b2abb921778c98fbd428594ebd7986a302 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 = mlx5e_xdpi_fifo_pop(xdpi_fifo); page = xdpi.page.page; - /* No need to check ((page->pp_magic & ~0x3UL) == 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..df0d3c1608929605224feb26173135ff37951ef8 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_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. + * 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: 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)(void *), 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) == 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 netmem, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 579789600a3c7bfb7b0d847d51af702a9d4b139a..0268b68935ceb27d9781e59a474a234a6a61ea74 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 *page, #ifdef CONFIG_MEMCG page->memcg_data | #endif -#ifdef CONFIG_PAGE_POOL - ((page->pp_magic & ~0x3UL) == 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 = "page still charged to cgroup"; #endif -#ifdef CONFIG_PAGE_POOL - if (unlikely((page->pp_magic & ~0x3UL) == PP_SIGNATURE)) + if (unlikely(page_pool_page_is_pp(page))) bad_reason = "page_pool leak"; -#endif return bad_reason; } diff --git a/net/core/netmem_priv.h b/net/core/netmem_priv.h index 7eadb8393e002fd1cc2cef8a313d2ea7df76f301..f33162fd281c23e109273ba09950c5d0a2829bc9 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 netmem) __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; +} + static inline void netmem_set_pp(netmem_ref netmem, struct page_pool *pool) { __netmem_clear_lsb(netmem)->pp = pool; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ab8acb737b93299f503e5c298b87e18edd59d555..a64d777488e403d5fdef83ae42ae9e4924c1a0dc 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) == 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 = 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 = 0; i < shinfo->nr_frags; i++) { head_netmem = netmem_compound_head(shinfo->frags[i].netmem); - 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..0ba73943c6eed873b3d1c681b3b9a802b590f2d9 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -437,8 +437,8 @@ void __xdp_return(netmem_ref netmem, enum xdp_mem_type mem_type, netmem = netmem_compound_head(netmem); if (napi_direct && xdp_return_frame_no_direct()) napi_direct = false; - /* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE) - * as mem->type knows this a page_pool page + /* No need to check netmem_is_pp() as mem->type knows this a + * page_pool page */ page_pool_put_full_netmem(netmem_get_pp(netmem), netmem, napi_direct); -- 2.48.1