From patchwork Wed Apr 9 10:41:36 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: 14044452 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 929EFC369A1 for ; Wed, 9 Apr 2025 10:41:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BB0428006E; Wed, 9 Apr 2025 06:41:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26A1128006D; Wed, 9 Apr 2025 06:41:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA3F528006E; Wed, 9 Apr 2025 06:41:46 -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 B8D64280068 for ; Wed, 9 Apr 2025 06:41:46 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id AA7D71A0518 for ; Wed, 9 Apr 2025 10:41:48 +0000 (UTC) X-FDA: 83314164696.30.DBD2419 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 74DE2180002 for ; Wed, 9 Apr 2025 10:41:46 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CQmuXzfv; spf=pass (imf06.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=1744195306; 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=keCS6rkE8az6FRDrj2tr4grUSIWZ80Zg56Gr6+MNAxk=; b=PttVSc2FklU9u/7d+NVBJai+d8sNTzEyLpQrbf9PLb+zaDWSfAlAtXgDBvRwx/HTYjPN7a 4FXtLwE8bQEbaZ/2iB2xcx4tHR0On7xzIZfT9F9Ly2zZvAKMK3vb9VkeTTtljQ5++LuHng zuQpjqNpoK0qDpcgb4gzBfFqKttIrqI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CQmuXzfv; spf=pass (imf06.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=1744195306; a=rsa-sha256; cv=none; b=8PtQDWg9aUUxD0v/vwQtBs3btAwhu0YOYVRlqHu/bSTkYXzn4g+Ten0LhTm0V/xa9IqYhZ sTwz5gdJPu+bwVp5SmCX0Vqv1uVEW/GieXCzyZHMXZWgZY/rmE9c8lI/qe1teiIN00Gopb 3nbKpaljUiQ5ZFGh3GeEW3yBrJDIJMY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744195305; 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=keCS6rkE8az6FRDrj2tr4grUSIWZ80Zg56Gr6+MNAxk=; b=CQmuXzfv3vBT8M0H3o5aO1CzrCbvqAlDYMzMxQ52PXYS9kJJ8PNNj5USIPnNwFgGWgCgQJ TIV75VSXIjuyDtFm8BBMshk37/re/LgPICmsAEDVdmFYaN9v80kpPY+OJ0sguE5/s/QWIX opEbYkVX8O3F5hh01WNQ4lKj6Q4D2Nc= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-qesye53mNYSCYy-NSMrSIw-1; Wed, 09 Apr 2025 06:41:44 -0400 X-MC-Unique: qesye53mNYSCYy-NSMrSIw-1 X-Mimecast-MFC-AGG-ID: qesye53mNYSCYy-NSMrSIw_1744195304 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ab39f65dc10so853379766b.1 for ; Wed, 09 Apr 2025 03:41:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744195303; x=1744800103; 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=keCS6rkE8az6FRDrj2tr4grUSIWZ80Zg56Gr6+MNAxk=; b=PyKQOP5tDvtcBL8hZpy8AtBiBsz31MAgy2E8JkIhtov2rRmKLRaQUsvFraoIqzot5K 4HkmsqtHEgWA9eBT4+ooeeIB4erB1Y1Yug0SuzUWRAXWiEUtGTiHUzZb+9G7vW6B49dq GSIKw5nIZtdbPzMWSe2oB4Z3qAuRjW/p30EPasT0i5LCmb0Slshgg2CmIksbiX3SRCcK ehTLCUIja4ZT58BvZpm/shLuGDpGY3HIfkryZ5xO05D6u4AoGQgfUS94efMFEI+aHMGT cUANXbangJsow2botS3le0Jj2eOZQzp8OHfw5frU857Oorgs7HiPzJCaAUyzmiDa2+bh DSag== X-Forwarded-Encrypted: i=1; AJvYcCUGY+eo1eQZ3wSwmt8pJouPrhN6mdZ7v8F1O+R5sqMijoQ2LYWIgyw+2XMJKB6cKkzOyUxG4uwfTg==@kvack.org X-Gm-Message-State: AOJu0YwbwxnuNLnnwbVI42VgP6YVLZSXOWR3pLHY4BVPqD9K9TciRZBI DFbupH/clyvDvkw2BxZWuavlNBgBjLJIe11AngF9qkZPufFqyM0iNzHFT7k38AlNnn5zCmv21hE YlhJwTXyYHmyh9Rqy5tyxTkXlLXCMJPkbLuVFflomJPgROtpz X-Gm-Gg: ASbGncvOCdjIjXFI40sQYlReacjj9M/xJvrsyfnG88RIcp6LAzCDM+3gFk9I42f0+lf Xf/ZPUNw1KkU+8cnCVgOICn6WYOifYSF40fBwaL0X+I/VqNTeWpL6Ch3sdgvZcuQOupSJqqpbjz uWyK/aIeGJh5L9gRP4qU5JR9yS7eUOLHS2A9iwtfG1N5BvLruHbYIu1pIWQxlev9j7fBDj5MfHp iUleXiDCkP0/XxLbhhk/mbdV23nIQJCw7OCEADsFvDSUVwQgpdeEyFWKo8maTd0mQqaFI4tDJar nHKG0mab X-Received: by 2002:a17:907:720e:b0:ac4:2a9:5093 with SMTP id a640c23a62f3a-aca9d6f41dcmr186462066b.41.1744195302598; Wed, 09 Apr 2025 03:41:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvXfYaDU2Kyv+qRtvaLu6bEQaj3q0t+O2IP75KWdM7fnM3F+iGoU29BBOyApnxG3CDOcUWTg== X-Received: by 2002:a17:907:720e:b0:ac4:2a9:5093 with SMTP id a640c23a62f3a-aca9d6f41dcmr186459966b.41.1744195302155; Wed, 09 Apr 2025 03:41:42 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1c02227sm74617066b.81.2025.04.09.03.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 03:41:41 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 9F09E19920B1; Wed, 09 Apr 2025 12:41:40 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 09 Apr 2025 12:41:36 +0200 Subject: [PATCH net-next v9 1/2] page_pool: Move pp_magic check into helper functions MIME-Version: 1.0 Message-Id: <20250409-page-pool-track-dma-v9-1-6a9ef2e0cba8@redhat.com> References: <20250409-page-pool-track-dma-v9-0-6a9ef2e0cba8@redhat.com> In-Reply-To: <20250409-page-pool-track-dma-v9-0-6a9ef2e0cba8@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: U5dc0RiNBe7Ib-GYTCbX7E4TNhOy2wYuALHmgoO0gsA_1744195304 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: 74DE2180002 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: mpzrsh4wa37yd97z13479qpsftdr4uy7 X-HE-Tag: 1744195306-27691 X-HE-Meta: U2FsdGVkX18z8ZZLhmnFK2RiArm+QbnW8tSEDvnkUkznktsXgML5Z3OCwIksnkeok4BI/hNtQzdyMWbT4T7/ZX/ShvGdsKIlJY0qIA7BpUjM0W3/lGeu44vzUuEsUDnaufPMGSF7KPHMDIE8cAAwOlQrcm0d0w0qLldTEI+fr9HAGBYpFa82YRCPfynZICAWxaJ2vle2SBLl4WK+HJq5QsTpTxuvnbHYiKYVyooE9B+oAsvRiVhT7+gS2yxQvfnHMBjkk7+JUksruyyvaTzD4zBn1252n+WTScM5+apppCPh2L/suUqFkDCNI7JyND24tXWcChHXWQCQFQ0rAMLaFzGogX0TU7tVrQpUUD/4p0Ab975HK57wemBlvl8T3xo+iAg+l8sW+/raiGqwUIxK67ptAqpFeQsDg2BDiHkGQ/wOJ0he9eto+QgagvRv/sBYmXgy5zJjpjbnm4NmkwwIsJhDsuEHT8wTgPiCgW0UJueDw0t/oEMfw3bqBPBQpaJ8bASsRPwrS5nM09pr22N7OnUT0xMShGuJUiujTYNCCKaCA7lwO8jhtzEvvsQL/oW1sstyUnROH6vNGIJvyb+YsLtKmwS1qL2LFY+Lt97GpQwV9XJFIdphZcRX19WWhIW8FMMtgOb2IomDPFtXoYguWyIVBU3V6g8WobZQ77of66Jb5j9t7n1GEZGmfCjzACL/PJF+dOBzUISHPsyhho7itGoQLaSY8K+eY/NYoZYe79Pk5boZRBA299/NWLJcanfIJhzm0WgYMR5Iw4n92YTm9d1GzeKdyywhjjM5l5fS9PnBH/DtIPGQVBTuKJL98R8jL+C0ZyZn5a+qqxV4MUipvR28qbm21WDtmBv/SBdlIf++/luAsLSlNUJfki/B9393PK7nI0PrJF1YNZqH30X0MogXdFmzbBvqDrAYKX76dHU6B7BT5hEyPt3CqpFpynfodi7+VLhEX1XUwTuo1Ny 7/iQMsfm ABBixLve1Cb3VgDvgGCLrjLbtY1+x+U4dT12tN9hen8y+aOdEfZYxxFfOkUiJGgm5cvBoAXMhicimsVIn2rjPPrqwRkLh8CMhW2DQkowI9VFNC6ZbRcrZ8T2r+ceQzMeRdQiVS/zim3T3fqrDeTXClzYlCvXCzGJeIg9bGUitGdNo4uHKmI2JatLzAQ== 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/linux/mm.h | 20 ++++++++++++++++++++ mm/page_alloc.c | 8 ++------ net/core/netmem_priv.h | 5 +++++ net/core/skbuff.c | 16 ++-------------- net/core/xdp.c | 4 ++-- 6 files changed, 33 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/linux/mm.h b/include/linux/mm.h index b7f13f087954bdccfe1e263d39a59bfd1d738ab6..56c47f4a38ca491b2457b46660782ebe04c30046 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4248,4 +4248,24 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status); #define VM_SEALED_SYSMAP VM_NONE #endif +/* 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 + +#ifdef CONFIG_PAGE_POOL +static inline bool page_pool_page_is_pp(struct page *page) +{ + return (page->pp_magic & PP_MAGIC_MASK) == PP_SIGNATURE; +} +#else +static inline bool page_pool_page_is_pp(struct page *page) +{ + return false; +} +#endif + #endif /* _LINUX_MM_H */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fd6b865cb1abfbd3d2ebd67cdaa5f86d92a62e14..a18340b3221835bc81a4db058e5b655575ef665c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -897,9 +897,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 +924,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);