From patchwork Fri Apr 4 10:18:35 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: 14038272 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 32ADAC36010 for ; Fri, 4 Apr 2025 10:18:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C1B86B0011; Fri, 4 Apr 2025 06:18:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87FFA6B0010; Fri, 4 Apr 2025 06:18:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C55C6B0010; Fri, 4 Apr 2025 06:18:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4D0106B000D for ; Fri, 4 Apr 2025 06:18:52 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 13179142509 for ; Fri, 4 Apr 2025 10:18:53 +0000 (UTC) X-FDA: 83295962946.10.C120C44 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id A792D18000A for ; Fri, 4 Apr 2025 10:18:50 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eAhmHIgw; spf=pass (imf16.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=1743761930; 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=B4+5hsM5ZBTs5xBrEabWDCLK+Od0ba/LsqZmsY1szhM=; b=tmSosBzL6gGe2F/5Yj5oUZcOJ3teOeMe6iKovtLY2APQUrCmJQre5yS/QW6YZi0e5MrArt NKy47HD6OnshRX4uN2d7vIiudronU1pIt0w5L586BFp7T1dwjdBf8Mn0QrOO3ju3DwPV5h Ceb+1lW1hWXGAYQui8etgVM6HMHiy/8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743761930; a=rsa-sha256; cv=none; b=Fb9z4t1fHvMMn5MABnqs/PYKBNHpqOnDZziOdYHaDQpRjweUM9MIb0RcK9ohSCyjNtqWLX IUKTLlPIYou2tgoNSYGO9X29K7nAS1O6nTD+rJemWuYu8zrJ9wCJ+wg9JZtcuBsO36qB/w ht0CZCQKdX+4qLDKYA692lfbfoT/8Ok= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=eAhmHIgw; spf=pass (imf16.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743761930; 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=B4+5hsM5ZBTs5xBrEabWDCLK+Od0ba/LsqZmsY1szhM=; b=eAhmHIgwK2+1/nkZ9HX++GfK3MhQaDNlDYW7Do6x++aiuc/4rSLrZziRW1da6/PiISePxo ZBbLXg3xJEqZAXB9TT0doVwt/tHZiqqfMaut2vrd9T+7BBNpCDHr0RLxc65NcbqXRjKKKD 2G2PB32ddfuN7C15KuAwbaxLrJMi5V4= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-1LS7-1v_MHydWXcKVxKa4Q-1; Fri, 04 Apr 2025 06:18:48 -0400 X-MC-Unique: 1LS7-1v_MHydWXcKVxKa4Q-1 X-Mimecast-MFC-AGG-ID: 1LS7-1v_MHydWXcKVxKa4Q_1743761927 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-30bf67adf33so14908541fa.0 for ; Fri, 04 Apr 2025 03:18:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743761927; x=1744366727; 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=B4+5hsM5ZBTs5xBrEabWDCLK+Od0ba/LsqZmsY1szhM=; b=KHlZAiERYdNX0QBcmbgtNUkOkBosGxYJX7ykocJB1YNl9gqrQ2X8otC5F+6VGu0z0U kDF2YER/qcd+MfSn5Noo2yBcC8tHGa6tkkaJRX/465/JWCsCQB1hsnywr4xdJ1J62Uf5 C/Bwd5oqLlBPCm5wJa6btM2eEnTYhh/0T63ZSn3yUFvqIM0ifyFLyqTP3Nw0Xl1Wnb3j qrSCVgqpxC8/Z22SXOki0MFwMdcmOOMuu7YiDevfiQVPpAjYfkU9AW6UUyDezm32KBIq yu5NIbeW1VAg8yKQw4gQEPB/qKlmVSXSvcfSNnh+FHz4fmaMjFF/boHVxaLabPQIDMWs ajEQ== X-Forwarded-Encrypted: i=1; AJvYcCVT2cy+FV4tIzFI7AnTSH7KSBXemslwHtn6LSy1Jsg5iLnJ2ejBIUgwJk/m6fF7w0lC0XbzNJjgLw==@kvack.org X-Gm-Message-State: AOJu0YyhT/07dQ66ffkLGP0wYtFWWlRdVaz7SREyYIFFt9yxLp5tDO84 s1kTRCxsIg66a9gy88K1B8ZqWYIdMxifKowGr/U8h5gB9/YJOZpEH8oSJnViTEFJL6tXqU47x0D vZKv4N1rA00f5dKqH/cWHYW8ZJy61XtDLq6O6TXYtSzRnB3LY X-Gm-Gg: ASbGncvGHrLW892CdGiDjt+wJOfX5xalrZAxHR0obWzEEOV/FFo++va+Y9Iar4CX7oy SQk+caaTle0axVm2vGCm0QLZyw1YKi87JV1VUmSvhZTdi+Fh1kdTyMXh6tWrx1aI8Gj0oyFiNx2 +13oChddQgjZqSZl96JjsJydqt0MLaS+RnJr59XMmXg26lMXo77ag/UUdX4l+D2u8WtgSnkgmfK 58jX9uEPOx8Hjn4o9S81rBtfmet96/8FyAR7JInNYXvm9OBsnYZNDBd71jFubD4RXrbdL6sukDN MwXano1ny3XvB88xegLdKuYAqnpu6dN7R+qezQwR X-Received: by 2002:a2e:bd02:0:b0:30b:f0da:3ae7 with SMTP id 38308e7fff4ca-30f0a70e09dmr8549011fa.14.1743761927077; Fri, 04 Apr 2025 03:18:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEi8FvjFb2phTAUuS/o5yj005VkalTxf39MNnqr7MnG0ADfb0rXyNWNd9MypI2JLw6h1MTyaw== X-Received: by 2002:a2e:bd02:0:b0:30b:f0da:3ae7 with SMTP id 38308e7fff4ca-30f0a70e09dmr8548781fa.14.1743761926662; Fri, 04 Apr 2025 03:18:46 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30f0314b908sm5149931fa.55.2025.04.04.03.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Apr 2025 03:18:45 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 902D618FD727; Fri, 04 Apr 2025 12:18:44 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Fri, 04 Apr 2025 12:18:35 +0200 Subject: [PATCH net-next v7 1/2] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250404-page-pool-track-dma-v7-1-ad34f069bc18@redhat.com> References: <20250404-page-pool-track-dma-v7-0-ad34f069bc18@redhat.com> In-Reply-To: <20250404-page-pool-track-dma-v7-0-ad34f069bc18@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: 9LZDuio_wD5xb4tquJgwpzs7xnIx21-l1LUZ0rjYbnk_1743761927 X-Mimecast-Originator: redhat.com X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A792D18000A X-Stat-Signature: re8t7434efgtn1oymsmguiborwmmjd1x X-HE-Tag: 1743761930-799763 X-HE-Meta: U2FsdGVkX18KQJQeFRx+aj3z7VN4IF/5Fn0gRDhcF7tQogl+huKvEbK5v/u/ZBEzQpPCZoqnAwHEwMkby7ZciGuyXVkOsG2wcuCWBRWuwrYrv2ralcRG+A+zPPjWzCpKjuwyINLKpgSUVK1a2BjC9Flk8bRlDv8e/ZvkW1W+Rl/Bxcd51lxbuLgiHW+8vDe/AAebSEl5AP0XFL4pFbUAs2Oquvl6XIHhmsPtDO0rwyt/IbW6I17NiBdIspWqA52Y7Hy6lwgZaivGtDFpmvztuJSzIlXXx2Thq0sjzwQ5hzaqV6MEf7DNePvD8V9pU1EuSNESKPTzh3f8c4DZhbrsGn1f60I5rVigbz1EFNbMzfOIxMpccuX17e/6ImsHPqEaHQVU39hilaDhxVDFmpuR6K8PxihWJg1TWOV7DXLzWNoUIzX4gNUKJEO1WL8dFsWZ/RXABF1sQn/JUCxMY0mIBCYI0VaVuLeZoavZYxlDwLDfsD/T+qfcp/I0zhOPWKyiYT6I2WYJUDzvmTzaKgMFpDpXr4xAzqUW5ChdXv9XZzs4INLajnuyMGcLKsmr/Dfq+sAd/Sr573sJVGv9q2Zg6XrAVQcSve1bCn9vP9GqdpI0OyNeegd2jZz18pzM8WmxavD4DPw5405GfX5JqqJQPHVZpOEAUfQMdF9ZT0IB1YlJhlnR9AGTdEbd2cu1TriogGxGohMFElnJYNaBzTmlAOG5iW8wFaepNCYLL0+RoAkVqdPIQDAJSYzzzmJ5DFbyXshnFQ5TU0VBkXgU8wEt9dtz6jSJ0uM8IGCO4ZUg5KtNKu+4gQntTCcolwUlaO1FPfXKriFiSy6kYLh+H2n878SPYC7GW121VJJyN+AOa/zX2SLkpnljRL3ViRWcNmx/aXXrahCnWURE0qbnqiq4YztQnXf4ipvfpOrSE/RIQUdt9NINQQsIJGfUkEXmQ4je1leKRUrbZU7023GLIzh NopOcrsM jt0yXKlUF1Eh0J+233oQ/nmaCq01BmIBYEufflvs6R69q7jacqKKoKWKt4iAAAy8M6YfGjS7kEKc7VoSeTWjdngWzZIjcc47NDsoL9Z3pFfOwPM28wskVYz1j7V/kgUxjzs4Dh7di85yGy95piUaNzP0EiHH7b0cwH/hUn+vUNvSqKYpGdMIpZkvqY1tZpfU4DxC8lhmy/TeS5N6jPsKQ78R7Y/Coyspj7KzBqWn23ogYL+cAVQhcgbVyXRGUdE3XDNW47lfeFrzFaaT0Ul7mvA3kHqRJbA1FM31Aj+Uf2qUs1QweVHo2xtfVadRJki0d7kxGPkxddpMl5tKTEqfOOc19hn0qoe5REd2ijrA6pwODEi7AA/Jvz2j3VC65DyKZkoJXHbskBdcT8VtVDkgn4gf1bGwJZQTz+mYSw4eMwQqKBXtUXU0WCn05PD7+O0Ri7B3IjXzo81MmSe/qO0UvxNjbZducZ81nbAjxXoZM9q7K0jbnOVxMiExR+FY4Xanld8Takb/MB+9z5awfDRJMK7VbTfgkePu20yGeufqc1s7nmWcejy4l0OAQUGmWP7B8kagNFb9Xoawxc2phQCkXL+K8J0EgGUCgsS4+BdifnMqcEFK2LjsUL6dEprMwzIzJxclb/FWBfGvZ4i2PUFCvSYQ0Ayy/+x5q5eLdE5bqLaXXEUQcal7l+bwO0vJBKL3UKdEyHzFfAQIOB4EAiYuJANECEA== 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 f51aa6051a99867d2d7d8c70aa7c30e523629951..347a3cc2c188f4a9ced85e0d198947be7c503526 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 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; @@ -926,10 +925,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);