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); From patchwork Wed Apr 9 10:41:37 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: 14044453 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 A143DC369A2 for ; Wed, 9 Apr 2025 10:41:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9C45528006D; Wed, 9 Apr 2025 06:41:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 92202280068; 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 6629D28006D; Wed, 9 Apr 2025 06:41:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2222C280068 for ; Wed, 9 Apr 2025 06:41:47 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1C06FAC69E for ; Wed, 9 Apr 2025 10:41:49 +0000 (UTC) X-FDA: 83314164738.19.CFAE103 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id BE40A160004 for ; Wed, 9 Apr 2025 10:41:46 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dHlSc+2B; spf=pass (imf08.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=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=E56SiMs9pP5+KSSVqOyuW2+e2++AdX3fmIJfRIfxrOA=; b=nRxmtHXO6fZPIkIMrepKyrlBkCcZcsY12Ys8ccv8Q673pNSqc7NMvdaU4alJYiXj3CpXrG Ijv2nWRE74wlm8ZMNpqtbHpFw0C6WsrtVJnDVjU1cfxjTyLEbHbu91OMQ0Wxge0DKaj7lW DGadka1aY8Ic+2QJep0zVd8ZB0mv3oY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dHlSc+2B; spf=pass (imf08.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=1744195306; a=rsa-sha256; cv=none; b=ZkreTrH2CAHjmahab8gQ1OH7Hk+d4MRW32APfsSepyzFafHxrF90y8whukKK90bPzV7aZk ddpVOmxWKu6HUEkueQ0ps4kjnZZxM2mTSklvpvAhSYBF2d2TxG7GfNkyS+mX/7EeOMVIDB T4Z2dP8vTqHWGQL4WZe1EJZsoTQ1gJk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744195306; 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=E56SiMs9pP5+KSSVqOyuW2+e2++AdX3fmIJfRIfxrOA=; b=dHlSc+2BRxoZCCgcnfX0zPtwII+FEuAo8zhJXJbcaF6aN4waYNh92JLGLGosgAJi0qPuw4 q/6xfu18QwgIoZyLvotoP0j0RmgSOIgRasSzl6xY6kyOvpHTVVTzsmEeCMdVHwYtME8IIo nGtsZBIpXvzSl9gJKZRrI1ETXuffr78= 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-612-qpaFzHs2NpKu5VwwlIqYeQ-1; Wed, 09 Apr 2025 06:41:45 -0400 X-MC-Unique: qpaFzHs2NpKu5VwwlIqYeQ-1 X-Mimecast-MFC-AGG-ID: qpaFzHs2NpKu5VwwlIqYeQ_1744195304 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ac28f255a36so551830566b.3 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=1744195304; x=1744800104; 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=E56SiMs9pP5+KSSVqOyuW2+e2++AdX3fmIJfRIfxrOA=; b=Xq1S/XOwWNRw/b5QqUSWv0auG9bvdy4XY4Xba5u+GwaZomM9a3wU+AGQoUsVEN/JVq 5hJaKJ5l6rUovzLE2XM+tWH3d1uP/1xxXlN48S1J7UJ2TcGup9VOl78gjOjfuhHe6DGK wUJ93dgrkj8FcZ+wIt77W2ucehsutcYKKdHvGGEhKF8I8hapPzkgVKtdPIZOs6nSzWQM gppD6xZgfKOU7PUIyjXTDlzuGY+Yl38Xm1v+r8SuY4tUqYVdx+bs6f7p06GE20I13qeQ 45QEQyFwXquQBKeAivglE1q5z3pwarVCmZxKRVSFRDvNkSDHzdEuYM3bHbEpjkl/bnOZ 7NVQ== X-Forwarded-Encrypted: i=1; AJvYcCXpXvsbMiyvhBIxKr3n4ul/CZ7ck1TcLH489isyoyWtVD1MmNpfRjp065MJmbWHF1bj+amroQeumw==@kvack.org X-Gm-Message-State: AOJu0YzB8W0pY89PfaQYlmdNtmFyJgr1NCOKdcr66O9wxfKoyXWTlS5R PZU0sd2YORT3f7d5k2nT5/hjAI6O8JcHZoExYFAc2y5Q749lQOxHnv15PG4YlI93foIhM1meDBK TBCbA9Br98e9d9dn/KFfXcDgbqJeZCL5hypLrys5ouIVSLh8x X-Gm-Gg: ASbGncvFLBYZE/CzmAY1A6YKdj3EIYy76f0F+/T2uBC0GeUgLcZo+tpJraMQDelWf0o 9h8XTmN6wTpLpYfL5XAu374vQ/CB2oTv+Dj5nWj+ttxjX98Q4QrOwHc8vExx8H82t/vJLx6A+R9 RUAalvnlREmHGFlVhmW2jfPmGUgK4WyVwwBUFN3rcmmfJE0GVFPYOV+0nyarKsrbOVxeK9QVHRy oEYJlI7e8kyEXyjD2zbV+dz3LETc4tuz8zdK7Nfzoy/U9h3QYE2a1dA2xKqiXKlTAYItOSB7wp0 YuM/GcRE X-Received: by 2002:a17:907:948d:b0:ac4:4d2:3867 with SMTP id a640c23a62f3a-aca9b694224mr228156266b.23.1744195303496; Wed, 09 Apr 2025 03:41:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5ZMLR/7EGejVCrmNO1l39NkCWBiR48G5EhTr5TiTkh82G7gz9UyW9GbCqTXMyQQjxffw+rA== X-Received: by 2002:a17:907:948d:b0:ac4:4d2:3867 with SMTP id a640c23a62f3a-aca9b694224mr228153366b.23.1744195302956; 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-acaa1cb420fsm74612566b.113.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 A057919920B3; 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:37 +0200 Subject: [PATCH net-next v9 2/2] page_pool: Track DMA-mapped pages and unmap them when destroying the pool MIME-Version: 1.0 Message-Id: <20250409-page-pool-track-dma-v9-2-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?= , Qiuling Ren , Yuying Ma X-Mailer: b4 0.14.2 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: bvo_HLKBfS1UTWuILGFFfCzbIXIxLg_pRZOznDNavLU_1744195304 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: BE40A160004 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: khy51a489zogpfdozg7ei4p7ha3gs6nm X-HE-Tag: 1744195306-648278 X-HE-Meta: U2FsdGVkX1/CXVP8jrIglyFVeQ8DKAX+rOr1Alok+36ignv2DPoIvvXTegsgxNOMxMVbh63fVERVtjpyucLljcyxhOyBReBtdh8xA4Qea/vmw5DyknQ7fPaozagvbcQQXYsXKEtq32Omg3I2zggdhPMeq5YbAZZp18RM24KaAh2M7sRrpy//ZuqRlHB9h1sFkGVp0jfdxriyGrI6D6MkHdbTZGdU8tQhm9Qi+d19eMn2mfhDfNQxWvSIt8sMaUAuIMsxJdAB7yO8tV/l+1Mpv+aZKF3dgYa0AgZ+8mhTKsCKg3sPgTRkx7iaZgpWOe2plzF2EZ+MS1CootXUgj3PyOf4Vd1lvQuy3tcBh5A+IBFv2IhVIUcTOgkEHrex0y/a1U5NTnnbGnMrVPGERTUXc9rRAC127vKXUo9Hzu/hVnggHVk3bDB3/XVKBB12ufiox/IyGpNvBe3Pb0WjSrCBG2+h4sVRr91Q5mZdr22kXF0jQ4vA33Wmw8vO8aRUdXCObBToGzP/5CV3Fd29tkXvu/g+ntprulRjEK5mnoFZC28rY2fqOugUDFejIW/P9RsYIzKebWHqhPjhnWDBD5ZjcTfqM8meoIOK2gVC/K2v92liGwh2gkQzzUZSkk9SO1gpB2s16eGVC6dxLTh4+E4xt27CEq/gsxViNbK0/8vGdQfDqfxFskXoPoCuBxGhlQOFQPxQE5r/7bOx0UKOhCG0v24sdRs+sz4tdHboehQy5+PuXspTMdrW8kiOkWjn+UA0hn9Kg0szIa5BX/fI/roCIcJcj3gICg0NqbrlF+SLcuF6fPuDNtYeVFrfgonvJddU+XAtJ0zTotkev02oyQbbxdLkgEO697FyAfQ+58Sr/wHn4c4E5IkkudcxV1VietxT14sRROCHwjgqDLo/5J/Y6w4uRPAnkYCN3E9q6/JhOfjyjN/uzecAD86R4yAAX7a8eZuqoyrwqh1sy874lXP Da74SbIx hK3C3Q0tdmxn5Wk5d20U5hxKTrkJ0ForShIKlSyfMR8loh8HoIK3TgaSAPVbKtAmlPCuTCg2kX7iq5wuIaYKL4uTpjzSugmLE7dHvaibyeeucKg3k9mc+M9Ysv4Al4wax6MpqGbI82zhRoX2Ilv6USY2Bl/fmfTzwzlEeMqKRM2bpFjFqqsnV+AhGj2TYiauYx+qXKE6CaxtLfhUT+7Do9yxuSSyhhv9gI98ppK4xkx4+nR1yhdPvgYLUw+QlYTHsdvSp2U/65+7N+tTXiEwL1J+YCk79/GS27oU29Q/9S1heTY2EM3HC9I+KyedIYmxmuCON7/bO+nKpV374SpnKUhs5mXDBaIcAp/kiPlpZFoTGT2LTtn6m8SCCQ0EKmJdBJjQkcEIygSkwOgqirwR/S2VBT7IAAgSDiJMYxsuClmHR2iQeSzyFV/A/P+UL6o8QcgIL1cvvfWbAm25qE8Y36ldWhQ0h6bbfJDrK1yKVXf4MrkLr6AWP56zGiIBTWkm1t7iWaOHhdoiJDoyjh1t336QJV26gPb2DI64cAvbGNi6PPlYVemWo6msBAqslHv0ZpBOQ81YBeNM8o6CNjfWBeGJUMypqo6xzxS9jUejEvCHv0xKVyyYuxHAtuFcPdexAWWQlSoGdx/TeDUKk/qOIK9gQZ2xlO8pDin/hzXxHfmE8EZQnZesEJoE1xOwN3Uvn7wCo2EHIz9juUek= 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: When enabling DMA mapping in page_pool, pages are kept DMA mapped until they are released from the pool, to avoid the overhead of re-mapping the pages every time they are used. This causes resource leaks and/or crashes when there are pages still outstanding while the device is torn down, because page_pool will attempt an unmap through a non-existent DMA device on the subsequent page return. To fix this, implement a simple tracking of outstanding DMA-mapped pages in page pool using an xarray. This was first suggested by Mina[0], and turns out to be fairly straight forward: We simply store pointers to pages directly in the xarray with xa_alloc() when they are first DMA mapped, and remove them from the array on unmap. Then, when a page pool is torn down, it can simply walk the xarray and unmap all pages still present there before returning, which also allows us to get rid of the get/put_device() calls in page_pool. Using xa_cmpxchg(), no additional synchronisation is needed, as a page will only ever be unmapped once. To avoid having to walk the entire xarray on unmap to find the page reference, we stash the ID assigned by xa_alloc() into the page structure itself, using the upper bits of the pp_magic field. This requires a couple of defines to avoid conflicting with the POINTER_POISON_DELTA define, but this is all evaluated at compile-time, so does not affect run-time performance. The bitmap calculations in this patch gives the following number of bits for different architectures: - 23 bits on 32-bit architectures - 21 bits on PPC64 (because of the definition of ILLEGAL_POINTER_VALUE) - 32 bits on other 64-bit architectures Stashing a value into the unused bits of pp_magic does have the effect that it can make the value stored there lie outside the unmappable range (as governed by the mmap_min_addr sysctl), for architectures that don't define ILLEGAL_POINTER_VALUE. This means that if one of the pointers that is aliased to the pp_magic field (such as page->lru.next) is dereferenced while the page is owned by page_pool, that could lead to a dereference into userspace, which is a security concern. The risk of this is mitigated by the fact that (a) we always clear pp_magic before releasing a page from page_pool, and (b) this would need a use-after-free bug for struct page, which can have many other risks since page->lru.next is used as a generic list pointer in multiple places in the kernel. As such, with this patch we take the position that this risk is negligible in practice. For more discussion, see[1]. Since all the tracking added in this patch is performed on DMA map/unmap, no additional code is needed in the fast path, meaning the performance overhead of this tracking is negligible there. A micro-benchmark shows that the total overhead of the tracking itself is about 400 ns (39 cycles(tsc) 395.218 ns; sum for both map and unmap[2]). Since this cost is only paid on DMA map and unmap, it seems like an acceptable cost to fix the late unmap issue. Further optimisation can narrow the cases where this cost is paid (for instance by eliding the tracking when DMA map/unmap is a no-op). The extra memory needed to track the pages is neatly encapsulated inside xarray, which uses the 'struct xa_node' structure to track items. This structure is 576 bytes long, with slots for 64 items, meaning that a full node occurs only 9 bytes of overhead per slot it tracks (in practice, it probably won't be this efficient, but in any case it should be an acceptable overhead). [0] https://lore.kernel.org/all/CAHS8izPg7B5DwKfSuzz-iOop_YRbk3Sd6Y4rX7KBG9DcVJcyWg@mail.gmail.com/ [1] https://lore.kernel.org/r/20250320023202.GA25514@openwall.com [2] https://lore.kernel.org/r/ae07144c-9295-4c9d-a400-153bb689fe9e@huawei.com Reported-by: Yonglong Liu Closes: https://lore.kernel.org/r/8743264a-9700-4227-a556-5f931c720211@huawei.com Fixes: ff7d6b27f894 ("page_pool: refurbish version of page_pool code") Suggested-by: Mina Almasry Reviewed-by: Mina Almasry Reviewed-by: Jesper Dangaard Brouer Tested-by: Jesper Dangaard Brouer Tested-by: Qiuling Ren Tested-by: Yuying Ma Tested-by: Yonglong Liu Acked-by: Jesper Dangaard Brouer Signed-off-by: Toke Høiland-Jørgensen --- include/linux/mm.h | 46 +++++++++++++++++++++--- include/linux/poison.h | 4 +++ include/net/page_pool/types.h | 6 ++++ net/core/netmem_priv.h | 28 ++++++++++++++- net/core/page_pool.c | 81 ++++++++++++++++++++++++++++++++++++------- 5 files changed, 147 insertions(+), 18 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 56c47f4a38ca491b2457b46660782ebe04c30046..130d3c9d2ee45eadb734dd431fdd37eaab09de78 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4248,13 +4248,51 @@ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status); #define VM_SEALED_SYSMAP VM_NONE #endif +/* + * DMA mapping IDs for page_pool + * + * When DMA-mapping a page, page_pool allocates an ID (from an xarray) and + * stashes it in the upper bits of page->pp_magic. We always want to be able to + * unambiguously identify page pool pages (using page_pool_page_is_pp()). Non-PP + * pages can have arbitrary kernel pointers stored in the same field as pp_magic + * (since it overlaps with page->lru.next), so we must ensure that we cannot + * mistake a valid kernel pointer with any of the values we write into this + * field. + * + * On architectures that set POISON_POINTER_DELTA, this is already ensured, + * since this value becomes part of PP_SIGNATURE; meaning we can just use the + * space between the PP_SIGNATURE value (without POISON_POINTER_DELTA), and the + * lowest bits of POISON_POINTER_DELTA. On arches where POISON_POINTER_DELTA is + * 0, we make sure that we leave the two topmost bits empty, as that guarantees + * we won't mistake a valid kernel pointer for a value we set, regardless of the + * VMSPLIT setting. + * + * Altogether, this means that the number of bits available is constrained by + * the size of an unsigned long (at the upper end, subtracting two bits per the + * above), and the definition of PP_SIGNATURE (with or without + * POISON_POINTER_DELTA). + */ +#define PP_DMA_INDEX_SHIFT (1 + __fls(PP_SIGNATURE - POISON_POINTER_DELTA)) +#if POISON_POINTER_DELTA > 0 +/* PP_SIGNATURE includes POISON_POINTER_DELTA, so limit the size of the DMA + * index to not overlap with that if set + */ +#define PP_DMA_INDEX_BITS MIN(32, __ffs(POISON_POINTER_DELTA) - PP_DMA_INDEX_SHIFT) +#else +/* Always leave out the topmost two; see above. */ +#define PP_DMA_INDEX_BITS MIN(32, BITS_PER_LONG - PP_DMA_INDEX_SHIFT - 2) +#endif + +#define PP_DMA_INDEX_MASK GENMASK(PP_DMA_INDEX_BITS + PP_DMA_INDEX_SHIFT - 1, \ + PP_DMA_INDEX_SHIFT) + /* 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. + * the head page of compound page and bit 1 for pfmemalloc page, as well as the + * bits used for the DMA index. page_is_pfmemalloc() is checked in + * __page_pool_put_page() to avoid recycling the pfmemalloc page. */ -#define PP_MAGIC_MASK ~0x3UL +#define PP_MAGIC_MASK ~(PP_DMA_INDEX_MASK | 0x3UL) #ifdef CONFIG_PAGE_POOL static inline bool page_pool_page_is_pp(struct page *page) diff --git a/include/linux/poison.h b/include/linux/poison.h index 331a9a996fa8746626afa63ea462b85ca3e5938b..8ca2235f78d5d9c070ae816cfd57fe2984db5562 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@ -70,6 +70,10 @@ #define KEY_DESTROY 0xbd /********** net/core/page_pool.c **********/ +/* + * page_pool uses additional free bits within this value to store data, see the + * definition of PP_DMA_INDEX_MASK in mm.h + */ #define PP_SIGNATURE (0x40 + POISON_POINTER_DELTA) /********** net/core/skbuff.c **********/ diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index 36eb57d73abc6cfc601e700ca08be20fb8281055..431b593de709375e07b5746a10a400d9dd014eee 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #define PP_FLAG_DMA_MAP BIT(0) /* Should page_pool do the DMA @@ -33,6 +34,9 @@ #define PP_FLAG_ALL (PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV | \ PP_FLAG_SYSTEM_POOL | PP_FLAG_ALLOW_UNREADABLE_NETMEM) +/* Index limit to stay within PP_DMA_INDEX_BITS for DMA indices */ +#define PP_DMA_INDEX_LIMIT XA_LIMIT(1, BIT(PP_DMA_INDEX_BITS) - 1) + /* * Fast allocation side cache array/stack * @@ -221,6 +225,8 @@ struct page_pool { void *mp_priv; const struct memory_provider_ops *mp_ops; + struct xarray dma_mapped; + #ifdef CONFIG_PAGE_POOL_STATS /* recycle stats are per-cpu to avoid locking */ struct page_pool_recycle_stats __percpu *recycle_stats; diff --git a/net/core/netmem_priv.h b/net/core/netmem_priv.h index f33162fd281c23e109273ba09950c5d0a2829bc9..cd95394399b40c3604934ba7898eeeeacb8aee99 100644 --- a/net/core/netmem_priv.h +++ b/net/core/netmem_priv.h @@ -5,7 +5,7 @@ static inline unsigned long netmem_get_pp_magic(netmem_ref netmem) { - return __netmem_clear_lsb(netmem)->pp_magic; + return __netmem_clear_lsb(netmem)->pp_magic & ~PP_DMA_INDEX_MASK; } static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic) @@ -15,6 +15,8 @@ static inline void netmem_or_pp_magic(netmem_ref netmem, unsigned long pp_magic) static inline void netmem_clear_pp_magic(netmem_ref netmem) { + WARN_ON_ONCE(__netmem_clear_lsb(netmem)->pp_magic & PP_DMA_INDEX_MASK); + __netmem_clear_lsb(netmem)->pp_magic = 0; } @@ -33,4 +35,28 @@ static inline void netmem_set_dma_addr(netmem_ref netmem, { __netmem_clear_lsb(netmem)->dma_addr = dma_addr; } + +static inline unsigned long netmem_get_dma_index(netmem_ref netmem) +{ + unsigned long magic; + + if (WARN_ON_ONCE(netmem_is_net_iov(netmem))) + return 0; + + magic = __netmem_clear_lsb(netmem)->pp_magic; + + return (magic & PP_DMA_INDEX_MASK) >> PP_DMA_INDEX_SHIFT; +} + +static inline void netmem_set_dma_index(netmem_ref netmem, + unsigned long id) +{ + unsigned long magic; + + if (WARN_ON_ONCE(netmem_is_net_iov(netmem))) + return; + + magic = netmem_get_pp_magic(netmem) | (id << PP_DMA_INDEX_SHIFT); + __netmem_clear_lsb(netmem)->pp_magic = magic; +} #endif diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 7745ad924ae2d801580a6760eba9393e1cf67b01..2b7684865941854660d32b8d1bb00a72fb550563 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -276,8 +276,7 @@ static int page_pool_init(struct page_pool *pool, /* Driver calling page_pool_create() also call page_pool_destroy() */ refcount_set(&pool->user_cnt, 1); - if (pool->dma_map) - get_device(pool->p.dev); + xa_init_flags(&pool->dma_mapped, XA_FLAGS_ALLOC1); if (pool->slow.flags & PP_FLAG_ALLOW_UNREADABLE_NETMEM) { netdev_assert_locked(pool->slow.netdev); @@ -320,9 +319,7 @@ static int page_pool_init(struct page_pool *pool, static void page_pool_uninit(struct page_pool *pool) { ptr_ring_cleanup(&pool->ring, NULL); - - if (pool->dma_map) - put_device(pool->p.dev); + xa_destroy(&pool->dma_mapped); #ifdef CONFIG_PAGE_POOL_STATS if (!pool->system) @@ -463,13 +460,21 @@ page_pool_dma_sync_for_device(const struct page_pool *pool, netmem_ref netmem, u32 dma_sync_size) { - if (pool->dma_sync && dma_dev_need_sync(pool->p.dev)) - __page_pool_dma_sync_for_device(pool, netmem, dma_sync_size); + if (pool->dma_sync && dma_dev_need_sync(pool->p.dev)) { + rcu_read_lock(); + /* re-check under rcu_read_lock() to sync with page_pool_scrub() */ + if (pool->dma_sync) + __page_pool_dma_sync_for_device(pool, netmem, + dma_sync_size); + rcu_read_unlock(); + } } -static bool page_pool_dma_map(struct page_pool *pool, netmem_ref netmem) +static bool page_pool_dma_map(struct page_pool *pool, netmem_ref netmem, gfp_t gfp) { dma_addr_t dma; + int err; + u32 id; /* Setup DMA mapping: use 'struct page' area for storing DMA-addr * since dma_addr_t can be either 32 or 64 bits and does not always fit @@ -483,15 +488,30 @@ static bool page_pool_dma_map(struct page_pool *pool, netmem_ref netmem) if (dma_mapping_error(pool->p.dev, dma)) return false; - if (page_pool_set_dma_addr_netmem(netmem, dma)) + if (page_pool_set_dma_addr_netmem(netmem, dma)) { + WARN_ONCE(1, "unexpected DMA address, please report to netdev@"); goto unmap_failed; + } + if (in_softirq()) + err = xa_alloc(&pool->dma_mapped, &id, netmem_to_page(netmem), + PP_DMA_INDEX_LIMIT, gfp); + else + err = xa_alloc_bh(&pool->dma_mapped, &id, netmem_to_page(netmem), + PP_DMA_INDEX_LIMIT, gfp); + if (err) { + WARN_ONCE(err != -ENOMEM, "couldn't track DMA mapping, please report to netdev@"); + goto unset_failed; + } + + netmem_set_dma_index(netmem, id); page_pool_dma_sync_for_device(pool, netmem, pool->p.max_len); return true; +unset_failed: + page_pool_set_dma_addr_netmem(netmem, 0); unmap_failed: - WARN_ONCE(1, "unexpected DMA address, please report to netdev@"); dma_unmap_page_attrs(pool->p.dev, dma, PAGE_SIZE << pool->p.order, pool->p.dma_dir, DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); @@ -508,7 +528,7 @@ static struct page *__page_pool_alloc_page_order(struct page_pool *pool, if (unlikely(!page)) return NULL; - if (pool->dma_map && unlikely(!page_pool_dma_map(pool, page_to_netmem(page)))) { + if (pool->dma_map && unlikely(!page_pool_dma_map(pool, page_to_netmem(page), gfp))) { put_page(page); return NULL; } @@ -554,7 +574,7 @@ static noinline netmem_ref __page_pool_alloc_pages_slow(struct page_pool *pool, */ for (i = 0; i < nr_pages; i++) { netmem = pool->alloc.cache[i]; - if (dma_map && unlikely(!page_pool_dma_map(pool, netmem))) { + if (dma_map && unlikely(!page_pool_dma_map(pool, netmem, gfp))) { put_page(netmem_to_page(netmem)); continue; } @@ -656,6 +676,8 @@ void page_pool_clear_pp_info(netmem_ref netmem) static __always_inline void __page_pool_release_page_dma(struct page_pool *pool, netmem_ref netmem) { + struct page *old, *page = netmem_to_page(netmem); + unsigned long id; dma_addr_t dma; if (!pool->dma_map) @@ -664,6 +686,17 @@ static __always_inline void __page_pool_release_page_dma(struct page_pool *pool, */ return; + id = netmem_get_dma_index(netmem); + if (!id) + return; + + if (in_softirq()) + old = xa_cmpxchg(&pool->dma_mapped, id, page, NULL, 0); + else + old = xa_cmpxchg_bh(&pool->dma_mapped, id, page, NULL, 0); + if (old != page) + return; + dma = page_pool_get_dma_addr_netmem(netmem); /* When page is unmapped, it cannot be returned to our pool */ @@ -671,6 +704,7 @@ static __always_inline void __page_pool_release_page_dma(struct page_pool *pool, PAGE_SIZE << pool->p.order, pool->p.dma_dir, DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING); page_pool_set_dma_addr_netmem(netmem, 0); + netmem_set_dma_index(netmem, 0); } /* Disconnects a page (from a page_pool). API users can have a need @@ -1080,8 +1114,29 @@ static void page_pool_empty_alloc_cache_once(struct page_pool *pool) static void page_pool_scrub(struct page_pool *pool) { + unsigned long id; + void *ptr; + page_pool_empty_alloc_cache_once(pool); - pool->destroy_cnt++; + if (!pool->destroy_cnt++ && pool->dma_map) { + if (pool->dma_sync) { + /* Disable page_pool_dma_sync_for_device() */ + pool->dma_sync = false; + + /* Make sure all concurrent returns that may see the old + * value of dma_sync (and thus perform a sync) have + * finished before doing the unmapping below. Skip the + * wait if the device doesn't actually need syncing, or + * if there are no outstanding mapped pages. + */ + if (dma_dev_need_sync(pool->p.dev) && + !xa_empty(&pool->dma_mapped)) + synchronize_net(); + } + + xa_for_each(&pool->dma_mapped, id, ptr) + __page_pool_release_page_dma(pool, page_to_netmem(ptr)); + } /* No more consumers should exist, but producers could still * be in-flight.