From patchwork Tue Apr 1 09:27:18 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: 14034571 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 0A86AC36014 for ; Tue, 1 Apr 2025 09:27:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9ADAF280003; Tue, 1 Apr 2025 05:27:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95E15280001; Tue, 1 Apr 2025 05:27:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FC09280003; Tue, 1 Apr 2025 05:27:32 -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 62A86280001 for ; Tue, 1 Apr 2025 05:27:32 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id F241B122534 for ; Tue, 1 Apr 2025 09:27:33 +0000 (UTC) X-FDA: 83284947186.20.AED4525 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf25.hostedemail.com (Postfix) with ESMTP id A1588A000A for ; Tue, 1 Apr 2025 09:27:31 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e6JtnoDW; spf=pass (imf25.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=1743499651; 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=QJwB2sfe7M4fb+6QfhCxJxoUzq7S7Di3c4mCBvfkfV4q6FEWO/cwbnAUvRQTubNFqHfHRa Oyf4SOwpaEMWv29PTnVcuPnMw0T3rNQBC4Oy2D56nLF4euJIurLMB6StYqsAcZ+MODX7Nh WEBkGDZ3skt/fVZ38pwCyhCnsLmGM6w= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e6JtnoDW; spf=pass (imf25.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=1743499651; a=rsa-sha256; cv=none; b=i5ZB6D8N+5GeESp5G/swE5nKLQfes6YlXVi+0s8W+LEHCqnaCXDmpl/tNkT57jZdldy131 AuUO0RgPQC+lyU/oIj+FBAAbz/1Bq2F+g3PPsWOoQyKakGfATV35Qe4g0Xu/tOsWQQKOEZ 7nqCCg1d5dIKgT43QrDyME+XSna/CFs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743499651; 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=e6JtnoDWf9QSMpoGDgI5ScHm9n59NEFa0e9xe5LeAjZD68qjQjoJNG3Gnt1rmsgC226fr8 QHRKF0W6b5pJrLctmdLs2DPlG4l1/2dS+MD0HWwJ9IrELkEx7T08k2BCS6Q0ohQigj2PU0 dpveuHdsQX0uOP39GCRARaqiWJ5sb/w= 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-528-kwxAOEEeNzmLdlf6lIaPvg-1; Tue, 01 Apr 2025 05:27:29 -0400 X-MC-Unique: kwxAOEEeNzmLdlf6lIaPvg-1 X-Mimecast-MFC-AGG-ID: kwxAOEEeNzmLdlf6lIaPvg_1743499649 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-abb9b2831b7so596985166b.1 for ; Tue, 01 Apr 2025 02:27:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743499648; x=1744104448; 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=eeXzTXF2LFuwGwrSL7HbOJtUEIvVslQDQRhSwHonXekIdelT/4/2wmFb/+BwSH4CbI N441V3YAooDKj3M955pObbS9MtgTmQHrTYAEdoDJedaVa0Fb6N+NBqUDMgbJukLXh+cH wNbEfiLcW5jsYJnZ5uY0JvlMnx12CT5zOJ5xtwlD3nnnmvB2RfKcsM8jfQr3dhGgso3t jbnZMV9rWrhcik8R9tFs4/uzhSQkFcpNebLHE9dIkLT1k4vA9/geSGRIe+ojWj+RwwDP QQ5voyjk1sRIHBwEX7JYHw2KhV8z+LmCSJB5KVMHA8PNK2ZZ06yFPtG75a2e0mXD8Pb2 hxxg== X-Forwarded-Encrypted: i=1; AJvYcCULFJ8G0s4/c5ZZzZzihY0NTG9r/PR9+6BaRYo6iJBBGe1Z23WmyDZzpMYLka5Ufa+LQMwJ4WW04Q==@kvack.org X-Gm-Message-State: AOJu0Yy2VnTXztCWxkKbZ9lSmsX+zqjN9HRB2+AiF3SX33z9WPvhFfiy hMxhipvfBKnNCNIhwDL2NBs0kn9YdantFSq3sGnxYIjy8EgaMh+uWxYCxuNEGpx/CAiFsCYDSnn yL1Z0Euiqm27Ma0MNL6C0vUYC6Le++BvmM6+qKGWYDb9opEpn X-Gm-Gg: ASbGnctKf0Ko93wPvMywKR3jI/82VULd+mX6uJSRiBKVorkxAhWJnWIjBwCozxyS6xQ FYE0iohk+/6zNkHCE5DSCr61QTKK3TgITN+YHTnJOwECiNGwTHpOdfTyTpZHQBhByX64NyJlOSn c2xh/eEcJ+aIe3l5vuh0AOWKAerZuBePdstfPawrIjS04vuJlK285jVGBn8nHQyi1jo8XCbvmJF IlPhyiRN4eA7qta6+gm9VyS1nF1bvremdn9yU4ZxK6L6pYx6wTvBfglrphfvQsrTpbqD7dgCYOm 5p4/bA7OYw/mwNBLwWFX2HC5T3VsfeMY70fCM++3 X-Received: by 2002:a17:906:c155:b0:ac7:3028:6d67 with SMTP id a640c23a62f3a-ac73681fcd8mr1141181766b.16.1743499648517; Tue, 01 Apr 2025 02:27:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrOYPNeSxQLyXxsP5j/BwzEGjjbGLErMD6rGLT5p4OaReguQc12bEx3/JNXtoHEWBebbAVKg== X-Received: by 2002:a17:906:c155:b0:ac7:3028:6d67 with SMTP id a640c23a62f3a-ac73681fcd8mr1141179266b.16.1743499648091; Tue, 01 Apr 2025 02:27:28 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac71927b190sm734107966b.45.2025.04.01.02.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Apr 2025 02:27:27 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 85E0F18FD269; Tue, 01 Apr 2025 11:27:26 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Tue, 01 Apr 2025 11:27:18 +0200 Subject: [PATCH net-next v6 1/2] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250401-page-pool-track-dma-v6-1-8b83474870d4@redhat.com> References: <20250401-page-pool-track-dma-v6-0-8b83474870d4@redhat.com> In-Reply-To: <20250401-page-pool-track-dma-v6-0-8b83474870d4@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: C-M-oLql_tDSTflxdtCdkPqcm_wHgLejXMcpIHPejCc_1743499649 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: A1588A000A X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 8ueyd5szr9st3tnt6kdysixgy9gongmm X-HE-Tag: 1743499651-157886 X-HE-Meta: U2FsdGVkX18y9FQVGVEZp01XFZGOLST9HKWN6rgjYiFst+X20EK4UfQSWQYgl0fYc4cOxaa3ttK33BOLwbrstzJ7N10tpf0UPLqA8HSN9/PBu3KZahpoEHSBv8tTal7ZfyFwdqtpKY28VOAyr/E/NOHxaOCpVg4LjEd80TxYmdVnkGNykiQkfJ9J1KR99TlgGNhXPKmv5dTTFnp7IIJQCWIfjpClEza124ZDGCTeS7uBtHv3e1Xght8ojHnvz8T8+z4wtBz7BwkXTXfd79KbkAtD8aE09Vt5Ha0yKFBfRGXrCx69vqnx3ucADQxv/ox9E02vqsHPMoQoVeEtx6inX2U2UNJN7utlAtt6tIIzgXaOGfupxjU5caDgK+taW42584hXJ3D973uW5+3ciQGoliyi3F0oviO+5pYkz5d7NYEVDAUCD7Z/4j8PEdlT84gRa/DNM1lMuAxq7yyw8Hzh9NIO5UhhEHVWYIDlMLDCUvfhfSRsDsn/j2zY8lYMdbmaMuyazwH0zC15jRcIWeFP9gilbYGXmsanHZuTbY3UMNXa3W2eagiy9MvW3KauUzhaum+JSmdmiamRdMLVmvEOL6+zeaZbmZwKCVCpFKuDqQc/bvQkRvp4DTnUtq40qo4BSrBm8xLn2K0iKcmdw98vYEceUh1QNYRZSvzGMYtThnZ3nml+KnUzEigZuYh+rhUSFeyGHPHDaxB5uTNLgNHJzejQWpi6EUnMEoQ3rZlFogJn28WgTZeGv0I6MEzP4eRH6V1tag5N5CLp2Khbc/cNMCsr5iZnUL0QIJMJMqSaD0KaXJXfKj59iM1X4E0HU/IyDuGEp7KX04PmI8I1meg6zkutFQQOYG9iVof+ubfqZU1JAPhqHlCfvf3s+/CoJ6WUYYr7KqHDyOzLM4cGWW991lI8Kk1iMWdjJ+gXSdeue7op94x2vRAS29XTgQVvqhVnujD7CsTCLewzjSFaeGk KEsNgk4M nyMNzablfKA3GyqSwaAvclShNKbGVVo892mEO9W6FhciwugwfS9CSdiyLFC8zFmE1UhVKIHn5xSyZBl09iPQrA5velH0NdKH9mMD96ygVqScuMpbV6NfTsnVRDKUjtsUogBzECxFyOn7rlsKxo6Q6Lzwey43orPn2YQMwLNyH7dBf+74XnuuRGfnbVbq8RGYR96q1yJHPqf6w93IlumItC19igPXiwm9gDdgVQXxwKeiUrJDuNB6J5eImJlOHX1H4rbUCdXYnswPSoFvRlJK4KRdpMBC+og63C1BrmtvK0QeU2iwvWMksliWMZ7+mDroq+XkHfKf8nJ6EAlgNq4u055r774m9ZFgmKlL9xAg1sDBR1GheskSQgmNcW/mfL7vy+OxUdhp7wxxuT9albfSAIzURRyUK9ZJm55w2HT7CiL+OrW621SrtEAge8OFAV8XbOiSD0OhTuEepTVFUWsi/tF+fuT51KJNLRgOHbNARuFnWARvibpZHIlG8NDtu8GDrvfG7aHTX9rg3T1oJEwFb7bSCeRfOm85+Zw4CCDtn837kICmFvk02iqPEjFbCQ3S4C7rwYi+S/o9dLLONP3T905X8eC75J5IvqNSpmSJeIaNDFpz6DunE1aTaa77aozabFbSlNmh/zEhn1Zq9Na2DFG+YB/H6ATCqeGWYQJj3uWXOFxopJ56n0F8zOo9MasuBm/uI+NqmnrbaU2G/g0NISGO/pA== 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);