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 AC15AC3600B for ; Thu, 27 Mar 2025 10:44:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AACD72800DC; Thu, 27 Mar 2025 06:44:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BCEE2800DB; Thu, 27 Mar 2025 06:44:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85E7C2800DC; Thu, 27 Mar 2025 06:44:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 65B2D2800DB for ; Thu, 27 Mar 2025 06:44:39 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0AC5D1209B9 for ; Thu, 27 Mar 2025 10:44:41 +0000 (UTC) X-FDA: 83266997562.29.C65226B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id BA5F41C0009 for ; Thu, 27 Mar 2025 10:44:38 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GNHT14xK; spf=pass (imf20.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=1743072278; 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=DD6/BKzSTAkniyKROx0SYrtrdsrFKedUxdUETO2d2g0=; b=Q9kIHsxvjdH/tk8nuuc7fM0TsxOSipg3V3yc5QDFIqjJWBgSueACKnfScMZ0T3sJTPE+dw fiKVoGA/T+c3zHXEWw1r705h7tYCOlI8Tog7pzFbGKLOD3WcQl1/Fl9o3AOXIqT2LoSwoE 7/HKJFPLlUy/JkTOEogMDdP3sCj3cKQ= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GNHT14xK; spf=pass (imf20.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=1743072278; a=rsa-sha256; cv=none; b=yxFusBggc31OmxeMw5I7iSfqlULhQd54YyRZ0Lrd3WXZsErOODrUf9a+92lrm+drAz1onX dj/CdA5GfdF2pNOn5FMQIO7RZSN6p1ByrxZYPfuLSKpnVovl5ibA8lhpgvUYRQacgfcTuK gKic+YRCOziWNrLG7bb1N/fGzwjdSnA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743072278; 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=DD6/BKzSTAkniyKROx0SYrtrdsrFKedUxdUETO2d2g0=; b=GNHT14xK9w8W/QNK4+/pRr7W5ExIrOz50Dmz88aYPf3/k+Wd6chkiLuBni3Ax+Sz4tuM6V ffRRotQBSWKTee2q4CXTeVPAXtcY+zwfyuRsNSgTxEA7G2eTODN95Cr5OSJBKyXfnIKMWR kHnwPAGB3X0yq7yQgUEhDVYqjXFTQYk= 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-568-S-3yW-xXNoS2FmRnSiEiHA-1; Thu, 27 Mar 2025 06:44:35 -0400 X-MC-Unique: S-3yW-xXNoS2FmRnSiEiHA-1 X-Mimecast-MFC-AGG-ID: S-3yW-xXNoS2FmRnSiEiHA_1743072274 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ac2bb3ac7edso112660866b.2 for ; Thu, 27 Mar 2025 03:44:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743072274; x=1743677074; 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=DD6/BKzSTAkniyKROx0SYrtrdsrFKedUxdUETO2d2g0=; b=ZTGtS81BZnlwdOipGwSbSPLG+RT26Ju9c0oVkkXKXEh3sCTYxilxqjQbBUs1F351wH QhpuNN5WXchnndwc+pPzYxsHU8KBd2cux6BjVcqcdaAVdg3i87L6VkXcbDHAjZdBFMHe ST+d5+wVeqVn8jvCoICruEhSFYcJ9oFtEgsneAX37RhMsxZha45W1/8LCB7x/0wpJctO aazzf4fhe9q87Z4ahMfJjf3K+w4aP/qQnn1sQ0Weq7WYVlmHQiYx30OARQCnSN+Q/1qA kVO7QRVQ2s1CRf1FQ7stkk7LJwyALc5SQDSkPwH+3p7qZOEkflaWRE9Gdx4j7SK4Bu/R BegQ== X-Forwarded-Encrypted: i=1; AJvYcCUbnrjLkKHkZi3hbKwkp1NmgL7375aDEy8BVdIS+Z+OfPpyHZevx82Ndw5J2nE8Mk2SM/IIAntCeg==@kvack.org X-Gm-Message-State: AOJu0YyLr0HZy8V2i5HP7TBntAPNRyjToeR0ADn1AFTnsboZnKi0rpuy 0/CZ7qJTSsP7Ammqo5FkGO/C7PNFfkG1/zhD3rDTJxsHmfaHcFAi4xQxxnNXVHjKFMA/ukBcwcQ bRaPi42r3ZAIMh98/YF75n3KN45USRkdtR8V6fUNE76plvtFv X-Gm-Gg: ASbGncuwzJwcAc2Z6svo9DyPhPaMPFFKo/24LrFa24GrAoSI/vbcodlQ5owmNCAPYCm vrVBHy0rYetu8/exHDBNY0YqhirFXF7kVCQntSs4IDxKsT7ez31KL6+1B4YBkx1aa/pKGRdGDqc hLKPLyGToDhOePEMs2S1F5i90UNQVui86oXVPikoXnqboUD4Xvbth6lrkM4yiwsqNPvKjhIaLGO qgYiKTGAoQ7ovtu8CplUAP/8lBtdyX2HQ4U/507q3ETFUg45gy5cAMvMeVYpHJZ7Nt4Vh6TmzTS EjFsp2F2NPE/WCsLrvlJOTCZN0MYkfc+cHIHYYBn X-Received: by 2002:a17:907:9809:b0:ac3:3f11:58ff with SMTP id a640c23a62f3a-ac6fb0fcd8cmr286809966b.45.1743072273670; Thu, 27 Mar 2025 03:44:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFxPuWZ2R8XoZhnXbaGCUi8rU1wqN4Dks9A+BhmNHTN8CMYZ83IBgl+xx3KMPCHFNluyzefA== X-Received: by 2002:a17:907:9809:b0:ac3:3f11:58ff with SMTP id a640c23a62f3a-ac6fb0fcd8cmr286805966b.45.1743072273078; Thu, 27 Mar 2025 03:44:33 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3ef8d3ee9sm1217855366b.67.2025.03.27.03.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 03:44:31 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id AFA8118FCBFB; Thu, 27 Mar 2025 11:44:30 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Thu, 27 Mar 2025 11:44:11 +0100 Subject: [PATCH net-next v4 1/3] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250327-page-pool-track-dma-v4-1-b380dc6706d0@redhat.com> References: <20250327-page-pool-track-dma-v4-0-b380dc6706d0@redhat.com> In-Reply-To: <20250327-page-pool-track-dma-v4-0-b380dc6706d0@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: LWTRj207u9DLbWsQFgWxrAk4nqNwaz86Y-eK0lOovO4_1743072274 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BA5F41C0009 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 4o67jkb7brzdss8of4dhd9jiimpa6rt3 X-HE-Tag: 1743072278-528749 X-HE-Meta: U2FsdGVkX18n/aoWLUwCNZdJt++XIqa4Vg7litaJpkHsMgB6c7aDfP4OZVkK7QbccWH+O6Pvor23tjpKnLBlLL9u6iS+gxIpaSUC7But2DZztSxCPo2nTkHNgppLOFsYkOLv6uFflyKLCUcD+cBYY2EwljCxqSkB6tERIgTXVwCF9Q2gDhUP6P6tZgvytw+wPM6Wlu5KBNxnACdFjcdHSHb8B4LDBUV05M+IVa9jULp62yg2WDPaUmFFWH/nNGFwS4TNhXvwJkyiaBqEYmOvhzrouFS52wKcNHxNHIojvvesf4Gwfo31ppCsEGdsvP8gT/gpVtoZ2zIzpE3uaivQsoJEFSG1nkszh9wVRHc5zKYKwaSMv0hXUqv1v8hynBXXyqHpAFdA01r8qi1dA0wfXLwfnxkzJowNU9/8KUgp1s7o/d9gfOEKVdTBhfD7DgLT1QXzapurRu0YNIHOC6z2oNULq0orTxiKePL86VetGxtHO0+zBSc06wvXUO4lctOXb3Yi1sSUSImMFm+VK2NMIp3jY/LT2dkURati79eQIMPWP7tiq8lNnbgE7x+Zo7014kz7ddNComT3Seb1b8J1chytivMEwnIDfwrXbGvwEKn0Z42NGm7Mvbzd1VNhrkq/UV/Z6dYCOHh54PccY5A0uAyzVGoNpw+Bbi3QOll+I6uCAQnKhZxGZ7V8+hD3pl+BEokJFczz2HDixVWPAdJHK9r+1XzZThuxXobGHbFGuPY2NV/eQdzU/gexx1Ugd+gfxOTM5+4wybddEjzppxveA1MT7W37K5RhjDVyUR8Jd0ocXMWSlIhv1X06mnSxGS93KmxxtRgmAoz3ixDjTPutuxAshSEFoztmOjKP1Sfs32NmKHdDbUUbs+bsTkh4WWY70czL/oOf8xQsm7xTYdkrC9qNqlJw/s/hMOf2Rfwv4QtnCNv/50U/LF/h4faL1SyigHrKoE3WjrAWySJpbzz +gqucD4c 2Bn0pjNzW/P8V9kiMSfuzUr+m+5U1eyU2O20GFCTNSl7mwJiJ4rWBe0TJSaiT+k4v9CLqogKFkJnnwedUzO+RKIduZUxsw+I2KYFkyDDbQYMmRDlB9mgVPT2QJH9pG64vMmxd6qBWN952bsGM0ROBhKjCRvMQbgK7lIGoIXFh7ZHyxVRPSsgwLpSeIKQskSA6EAWfYwy1E1S86Scu8r2Qn1ZKnAQkZ/IC5I1sYZxvVnzm+qjQw1QvelTL+O3tBvP1N+kO0zAb/B8TTIZZz0XrHi7q5++ujRmNwT63i+sj6oVYRxl5MElvlKusWxX1aw3At0mKALBi6LDAgJJC0U25BZ0Dsar2r3LzzHgKPN0FA0207aUYS2TW6giokvcXZxaeC9V4FiHXumSzfrJamUbURu2qLrqge5TaEKWDOYsIG/wOU7xZICKhYQIg/8RXABEB8Wk6utSAME1XNVfd3jWd1vmpuIstLgRvPK7FiOKjDYmkrxW+WLu9yP4qtcGnNPDAbvwfpkU/tINRH2kpGbJdWPcTi3WNzWlMjI4vFCpyuZDiPv20t0spR1QM/jGHB0m4tgxmCM+kNO4mwQVUty2mVvhsGVwnlgmhXhtFMvOKfVzZfYCi2PVr47s0YMBGc6jmNZeSMOS95GQaDcWbB72BpcbcMVz1OQWNsF27SJWzRZMJT5Xq3uN2dJ73f3YGIAajGivTOPE6D2lGwLjL8itq8ztIig== 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 Acked-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas 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 f803e1c93590068d3a7829b0683be4af019266d1..5ce1b463b7a8dd7969e391618658d66f6e836cc1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c @@ -707,8 +707,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 6cbf77bc61fce74c934628fd74b3a2cb7809e464..74a2d886a35b518d55b6d3cafcb8442212f9beee 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