From patchwork Wed Mar 26 08:18:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 14029862 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 68B9FC36010 for ; Wed, 26 Mar 2025 08:19:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BE2B280063; Wed, 26 Mar 2025 04:19:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 146E9280056; Wed, 26 Mar 2025 04:19:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDB36280063; Wed, 26 Mar 2025 04:19:01 -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 CCA35280056 for ; Wed, 26 Mar 2025 04:19:01 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 038751A0E4E for ; Wed, 26 Mar 2025 08:19:02 +0000 (UTC) X-FDA: 83263001766.06.4E4E76F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 85C9940006 for ; Wed, 26 Mar 2025 08:19:00 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NPWA1fba; spf=pass (imf17.hostedemail.com: domain of toke@redhat.com designates 170.10.129.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=1742977140; 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=wHU3gd5R+PcFSPJyd+8lTgr7QvXzHN6SGWRXjaUKaHA=; b=qHolZXiiZTKvwDQobgBysPK91FUWrASS2rHVLBFyR1o/1tHtU3Ro8MgOhlwEDEKLLZUeb6 kyNYuiGKMhYiYeCbXZMowlh5ixq+fnZAmEfykYcN6ydeo5vJdnJCSp8FnnV1y5my4kypNE PsOTDW2jri1pAcBOdcgcyax3QKHt2lg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NPWA1fba; spf=pass (imf17.hostedemail.com: domain of toke@redhat.com designates 170.10.129.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=1742977140; a=rsa-sha256; cv=none; b=PCwsgoRyGTf+QSCpy2KdLSAWwlVM9NPBwfEi28nnCrsQhrpg5R7ldEF6LoLUcWuay895zi 512iIivUQMIRVpf4UFXdAAXDGTp6vLlVjkE8UDc6kiBoEtoMK1SOmz5adjc7jrYdB+smdk 4n57aymTNTC2u/fG39g4C5EgFy1vk9o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742977139; 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=wHU3gd5R+PcFSPJyd+8lTgr7QvXzHN6SGWRXjaUKaHA=; b=NPWA1fbaTHm8PBhNTk7W+JR11NPQkiiqpXv0+uYSvitaictl7a8hlxFPxsgkMNdzjuBrXE huGZvUi88nyXUveYlX+yhR6brriZxjUNzus8AXlh7esCZkx/hYSQu+g0QKVpYYwUndcgaP zbjuPlS/rDjczi+i3thpxZdWk1TTYnE= 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-685-JmS_cLx_N8CwtL8ms6S8SQ-1; Wed, 26 Mar 2025 04:18:58 -0400 X-MC-Unique: JmS_cLx_N8CwtL8ms6S8SQ-1 X-Mimecast-MFC-AGG-ID: JmS_cLx_N8CwtL8ms6S8SQ_1742977137 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-abec83a498cso522333866b.1 for ; Wed, 26 Mar 2025 01:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742977137; x=1743581937; 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=wHU3gd5R+PcFSPJyd+8lTgr7QvXzHN6SGWRXjaUKaHA=; b=dUL6cqrWxka3v8fnI6WStQP5TI8G80enez6H6P/lPip5wib7rFlnxiNTPqJbbjfLDf MpnSyWy8YZI3z/JZknFfrFzDbld6MSrxFi2GvXZOi6/iWQKkYiEKBxqngdP+W15vR7ni fAU5neTrez79n8DFMvuPMTl7786Q4RwG4f0jlKk4J4tzJPbDea2ALDxYUpuzLtBYFBrx ppVxo9ah2JTSTd91JsVbYDBORe2UqO2YiiCZT1qRmR/1A3ktgmtK4F7fMN19f14TfQbk iE5Al2ZsXlkmpWisprGW7JqAS1i390Z70KeewrEGbV12YqgNy5K6UzSk1WYfyYyDtyKE 5P3w== X-Forwarded-Encrypted: i=1; AJvYcCXQotlPQiAuETRcF+kGzxXK4LsR4PfPoUDnzNGWcc+nYmvMmZ2uSGucf/5FBqwPh5oHHzED9iaobw==@kvack.org X-Gm-Message-State: AOJu0YwECUjD9qWwA4pQiFxEk+wojp42kLjPzWUXdgHKV+MymrTfFkd9 6ug8i6KN/w7Ss3PdCtibHlNFvqZkuvBH7KHz6fQbmWY1sCafL8IaM0/9boC9BAxgt/p9c8YvMA+ SV5oiuiLk1WsvY1quCSo5xzlwNxw09lJSu/Fr8nhNf2ll5xUy X-Gm-Gg: ASbGncvL5Vq8bkj9lipgFJRnVS7LLbcbxsdWe+qJaL/kGUKI2CzT56dCrxxdnqujPuR mwT076fJCVIBJQ8uxQbg/qv6zswsmXr0YFUlpd8MwRiunmMDcefNDOiNaPEoNDEedGyX83ABiFe EZ/bJQs1HHhylssqWPRG6FGt02Q4BykXMesV+KZuTkrS6TQ891YtcT82novbtUE7RQEJ47xd0HF nkSHZ523Uqq24bDN74o1hx7rXOk5TSAwwAWjuEoB/D6Awc/NLs17v5qZZ8ks8/1tA0KrypFt/Cr HD5aZUxo8+bLTHNBQcJrzcUYKy/0IW1FrgMNQGM2 X-Received: by 2002:a17:907:6ea6:b0:ac6:b731:d327 with SMTP id a640c23a62f3a-ac6b731d3dcmr641047766b.4.1742977136838; Wed, 26 Mar 2025 01:18:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwezWzI1MgFdP9DAT+/2zNUhExClr8nnWD8c6ObA/s1wOXjNoqUjslh6fgHhj93GwDZJxa9g== X-Received: by 2002:a17:907:6ea6:b0:ac6:b731:d327 with SMTP id a640c23a62f3a-ac6b731d3dcmr641044566b.4.1742977136301; Wed, 26 Mar 2025 01:18:56 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ebcd0c74b9sm8933274a12.62.2025.03.26.01.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Mar 2025 01:18:55 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 50AE618FC9CC; Wed, 26 Mar 2025 09:18:54 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 26 Mar 2025 09:18:38 +0100 Subject: [PATCH net-next v3 1/3] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250326-page-pool-track-dma-v3-1-8e464016e0ac@redhat.com> References: <20250326-page-pool-track-dma-v3-0-8e464016e0ac@redhat.com> In-Reply-To: <20250326-page-pool-track-dma-v3-0-8e464016e0ac@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: MgrBWVIevGR5ifzZxoiccQG-GPWUcIcOQeNiCGIwgsE_1742977137 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 85C9940006 X-Stat-Signature: pu56ssxrez7ue3wsob7m4p987w3n9ak9 X-HE-Tag: 1742977140-553315 X-HE-Meta: U2FsdGVkX1+6J50vofMmOtP+Wirsu4Ti9Xc2cn/Ka4/ZQZFzOE8GVdZ3u+HVyutXHEfhsS71rlcwCvJfZ5xwpvNLeFUQQE0B7wouOPB0l6XBGw4YAS36k2CfR4L8Swb6slGAKHiCOvu5gGc5o5YkPHW5JvDCKs3s/ZCX6cEI/Zy3hG4XBIBGCoGb2mNoJI/pNmjslpLBrq823CNNnUtkZbPCqVON6A+A3eKyd0zdyfJGXIyeS9Ot/SqttywmDcy8Xj3w5BzFfiyaA9+0g+v7U/7kL0IMzA/C3tz0huvWRzBhceDOGWAd3Md9pyCljrRPiv9RYRuKSKzhIjEhMOly5WXrx5lxLteR9F6QSwHTDxKovJkgiyJl7FYvtq+DScAwSh5eDbtTM/gPkOJHgapis2k9e7LHJ9rZd7p2y14TS0pm3wwmo0FEWZ7w93kxA4omIewvMbd3fI73B9qtTEzL9N+g9ef4dMt+vQxIZc891rB1+KgAh1t2UzCRECiNNKSKK+2fsM2ur9VrtbE7XgA2rrgHeOvtwTTVuIC6WQ3MVxYqIEfNlXv9ufaLeyy/rZGtb/yHcc/RFfU8XlWacmrhysnWPpS7wGkiaU8tntuHtDmFaXSKx0Ie23Oj2wY93C5Zl0vxlU1W7rtrg1Fi/v9HQxIEXtc/MyYhmS9bvPN/AABIOe046MZLq23U6UavFJ8LKWOEaGl+7nyWvmPGlCdrOC1YagBxXTKkzf8OcPabph6B+QyIgnwBNlJTDJsJ0RjWMN/3zKU8ObR7W8D25UHJXjn1atc+Fuio0xLVIUN8iSmGCCcGtQkiK0z2os0Mpo5YzUVOrfqdyQB3Kj6qHnIk/1vKaJqBNa3AyXvJ6T7s4wi0rYjhDUr4pWF2QjH4kdqUQ4a1B/Cdd1nWiKBAVwNG/bEgRHJ+h4yUOhm6JxOqALV34WjOy+Nrr5am9bVxMUdlYkibfjhcFqC2M+op1Bb EueZPm4N i4/vS8OpTL3yeGuoEB16bTLUUD6zxfQfIQOPd91mf3RhKRUpwV9Xbd4N77LbXz/lam1yuwv379bWnDH5fYphIJuHltXr5tp4SEaagpPcS6v2uQRXfC0OTeHIYiLJqPXyWhtIGQoihlAjKA/v5u0lmHRaNYD+neY+rLBu+WMIEIqxWZ/DKPRyId4PFmV5f1KoCJ+0X/PCkVjhddhYN4DCI01rBrvEsxrFoT+yZSTxVrkCwfDjJuwb074lXl738x7g3YLnPsiVtrkoKKbrUMh6wXyisuqtaQtaNrwCIQV3nl4+RKjzP7ehMavUwDkCunvS7rGZc69UxEIzU3Gln0V88MFgi2AC5+MfIFgKmmoPYT8C+K2YotsI8eQNbZGEJCvVTjbNAKBZC4A1dAfTDuZUkMxUurAwuKX8M3j1YvZjCjwCRlTMv97pWAINPMXTmC6NLo0m3Nk/AYxz+chQFRx7Y1KPGKEAAGnubt8U1H5GqdFZy+GBTW92r15bIbkO7M4LkMdAII/PQ6zTCo2G9Zz7RTSwJGUjOnFGErCfIYS1kVGAt+lcwYcuOe854HJskdTkl6AOdu1aBDKfaf6JZ/1N3By7EG7c0onzDzc70OSvq8wX5dzSnLQNEFtyylwRQGeOwx9tL9sqEQhfXDOo= 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. Reviewed-by: Mina Almasry Tested-by: Yonglong Liu Signed-off-by: Toke Høiland-Jørgensen Acked-by: Jesper Dangaard Brouer 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/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 542d25f77be80304b731411ffd29b276ee13be0c..3535ee76afe946cbb042ecbce603bdbedc9233b9 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);