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 E159DC36014 for ; Tue, 1 Apr 2025 10:08:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C01A1280004; Tue, 1 Apr 2025 06:08:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8AB3280001; Tue, 1 Apr 2025 06:08:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2CA4280004; Tue, 1 Apr 2025 06:08:05 -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 85629280001 for ; Tue, 1 Apr 2025 06:08:05 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DE8E21CEF64 for ; Tue, 1 Apr 2025 10:08:05 +0000 (UTC) X-FDA: 83285049330.14.DF55CE1 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf20.hostedemail.com (Postfix) with ESMTP id D7A181C000D for ; Tue, 1 Apr 2025 10:08:03 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GoNU5Kxv; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of asml.silence@gmail.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=asml.silence@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743502084; a=rsa-sha256; cv=none; b=7nswVQ88hy6XqgwKrd5EdF2W8f49ElbQe9Eym+B+or8OWHYYJ6JbS5erekhVzj81CnKC4d gl6EIzhwjbwPegeowol/DowTb6H+d+CbVNZxQ5agbRkn9y59bVXNfw0WzsbwG7RdMA1cig IzZdz/CaCiUyX4mNEYcxCHjH/xEenI4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=GoNU5Kxv; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf20.hostedemail.com: domain of asml.silence@gmail.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=asml.silence@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743502084; 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=fYH+2FNA8rvv9alcK9f9QT7dB4gXsn+f8xBysj3Cjuc=; b=DkyUoPsSIootoDGlda3ukiBV7Jy861G5XgeMwkrYycM+B4E+Yf42dEUEOMKzPzNIcxYfc5 D4tiEhz1G/f2lgchMirpRwEmIq2bdE6MGxxtM/yggYhAeSCUT5zFk1nq8K/OFFsj4Kt3yL 72Kns0QOHyKf72mhDZOI2phMyNslJa8= Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-ac2c663a3daso1036046666b.2 for ; Tue, 01 Apr 2025 03:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743502082; x=1744106882; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fYH+2FNA8rvv9alcK9f9QT7dB4gXsn+f8xBysj3Cjuc=; b=GoNU5KxvZL7hXkmF4GnTzAlZDNb0gVO45yXWs07I6wpfLSuJ2k7JfqO8IBQWE3yIbc ajFRAzZ+uCpHgwteLVmj+UYqqc0WvZkT4fqUnRMovaj21ZQfNfy5zORcNcXH4OI1NKgp ilpuU6q5h5Eqw2VnCNiJjoWMmv9aIIjCHE4AAIxKIGXC3RYdpHnXCCSKK8lWA8uMEIE5 8+doPo+6EEiUTlX0GgdzFW8M1jTtpcQ5Tk6pq+VaoF2MeO5Z3YhnXe1V+C6dqzH4BP0F TmMdyJ9ABIHacryn/2Ya38OcpIrA9rpKsiKXXKtQ/LAewLTRA1qrO4Rnoh1rLCEs5Vc9 IvAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743502082; x=1744106882; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fYH+2FNA8rvv9alcK9f9QT7dB4gXsn+f8xBysj3Cjuc=; b=XVkfxQO0Jl2MsqQANMhrp/ND+lZWsIoarui+NSe8IyWyapT2/453FDv4Ct5uEufoeL Py+jYaDqAROAwjruTwJggTZW5eWjc3BEJzh2BYDpri0qJYH/i74Kc5m7savIbegBsEAQ HQYdLxExFZb6/cMmdtaoBKlX37IKZongp+Lee7udHMOLe5qfJuJz/rm36KOw1a7Zkl1E bf3JS9hKfFa0gB6vB47q8rroYPX+WTMGFQgqNMETI5PN1esCmsCWz5oS3lNMM18EFXqo Vm/m03t73svWuHIPViHyHPh64f1PLfDaJMM00/Ltrwxj5e0Y1G0HT98LncODO7qkLYiE bcVQ== X-Forwarded-Encrypted: i=1; AJvYcCXJFKrEcZkik25B+q55zHfB9FXkI7HCFxd/uiYZV6GyDtGl//2uTD1DO6iBo8OEuSX10K+JHgykVw==@kvack.org X-Gm-Message-State: AOJu0Yx4VryIh9bJgQz4UAZ59apGnBMEZucO2dcYZJevtdbFV6mLzCcn yrrnjZ5CVvRBLReT5mLfetH2Z2kjx8Kr9TvCgukIH9SHPusQ7J+W X-Gm-Gg: ASbGncuCrcjE29ty70Vrn74f20EfB3dqN2MQpPyhxPf3sMf2TZSt8TyBL19fhBE8MK3 Uglguny0MEIfscOAe/vnjBXQIgP1dD9+2EVLreggb7/ovxNZZp+pi9JbV039pe7a3RP9e2yOX1D htyzjv7LcOAsPolt7c1neF5Zrw1YqBLvrqS1MUcxUyjFc9PVWxCklmK7sOAw7p5r6fy80bKNQeK f0SBUZORH6r7601C4EjgF0uZcwNzsBZMzRH6Md5YB/GUcBMmpQcMfeqiUqit1MyTP9sI0tJdj5c AIMteSy4lhStd11eTK+qXoX8bAb+QXsR5mr4y0LrL32kq2uzUOOOiNwjlm8EOG76Kzc= X-Google-Smtp-Source: AGHT+IHeaB4+CbuAMNTM2JJK6YjWQ8XZ2QNM7iV6Hl/13rCtW5kfhBjuwqGhAcx528XHoq9o7CWlDQ== X-Received: by 2002:a17:906:d553:b0:abf:6264:a624 with SMTP id a640c23a62f3a-ac738a8ea3amr1048949466b.32.1743502081894; Tue, 01 Apr 2025 03:08:01 -0700 (PDT) Received: from ?IPV6:2620:10d:c096:325::83? ([2620:10d:c092:600::1:2418]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7196e954csm750929066b.171.2025.04.01.03.08.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Apr 2025 03:08:01 -0700 (PDT) Message-ID: <3e0eb1fa-b501-4573-be9f-3d8e52593f75@gmail.com> Date: Tue, 1 Apr 2025 11:09:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v6 2/2] page_pool: Track DMA-mapped pages and unmap them when destroying the pool To: =?UTF-8?Q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , "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 , Matthew Wilcox Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-rdma@vger.kernel.org, linux-mm@kvack.org, Qiuling Ren , Yuying Ma References: <20250401-page-pool-track-dma-v6-0-8b83474870d4@redhat.com> <20250401-page-pool-track-dma-v6-2-8b83474870d4@redhat.com> Content-Language: en-US From: Pavel Begunkov In-Reply-To: <20250401-page-pool-track-dma-v6-2-8b83474870d4@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D7A181C000D X-Stat-Signature: bd7636xd8i3k6c1rbuf3trfnjxokbwwx X-HE-Tag: 1743502083-309328 X-HE-Meta: U2FsdGVkX19DOcPW6uigDUOxifDv1ECPM7C9z9w5SrxY0P0f0cTLUdREoRMTPPJGQ2pKEyKz9TJK+oU64NrQRyquPc5KjWpm6zyzNc73tnx5rDXPm6rdpY6iocf5Iw2RELqCakthK1c4oz5WTe+FNkFBsMNIUE+sgWUPfWw6AsMJAVqtYX910PFoBQ610PFT5LTi4+G8B544sNRpEutW8CIQCq9C01J2Z7x7JHwtD80fCr4hoOn12T0jzTbrNdRAmReNRcIammb69IM9B25eXDw4jEDLvYywME10AdpF3j0LtKTI8GVr+exYQTw6hUimVkMOGWMuPhiZ1/dV07rpG5navbP6ByI5kzpkIDPiDL9mjlEk344QBfO9CjcLHW6bVTwtJ1bnCPVniEaSA+AtsLzpAEk1ROvYsTYsAbVrMbt98weyWsWMeP87Rft3obB+IbmHIIuXFNmAgvCS0w2+EOIkAtZkDhvgMAOTdntsRCm+3yA60NA1jpSNUtPrmWLjc1WHvyzQT6AGD2fGhtjmfX6zQa6F12xD3Z17jh+K2WvHDxLGhrug5hO9esouqOO7Ep3sPsdiI24CwtMSllkSfb/f5rXm2tS6QoU0Ig7+F2cYPMA7scgwYGiCfAzk6AGYXccmwJeHMDzcyfXKKXCBQNddvj+HB7nDiMBc3r62k4U5Hr0ZCrfRJQ3wkW0vsKTsFpSkClm3T+zXrZG5oboCHnmxkbfYEaMZkRAH/eE7WiQjCb1TdtvH039q71ybehns16GvZXN1Q0B4g4frzGxPTAyHJ7nEdsyH9wqqW4xeE1ovYcDJUWnpX5X1maeg8eYfLo7TsSfauKy5FZyupGeQKDg8oraTA2P4Qq/EvuK52IDxZKuUYFy3CygbCAslq8GC+WV57XdXHFq0d/QeMTPUjkAAynt2yoqmxSF2REkXmwghi9qIMmYwFEAJx8Unfd3J2ChHcMEez82NYcswBFy QBIYzmz2 48OQxw+k37y9bMoDk40kswGK5GWIzDra43J6tSTj3dd+SwDK+liUZXiiPgwx/zsm8TzPNQAPe/yiPu8/g1bIWimNSjQKrtFnMlM6cEerRt1uak6pLLUURsQdeVKOcipt2050ZFvsATPBk07oH9sleEi5/nr75RGGwTpP6U8Gj+cCFg9NDqUe5kuwsUPd+1z4xCPh1EHeAikZmUbIeVkXM53xJnR1UvluysJ6xVRDJU4zORD+iJlESnofKkCthICLtvkLofDYEtCW+kXtABqYCOZ9GkryzO/2Jr5QTgUbx8UtxsuqMwbLa5hkxcXNHZ3gur//ABHvfTOz1M6BPG54gcxmhFF4G/qNgsURxtpBjDBiRywdEoX1YQGU1/eaVhpMYzHqPZ+QBvmCQEE8t+3Ftbm8JTS+8Ptu1ogP7XbuGDe4EtSNw24Cd/R8pIPZCkEmRgPKeUSTjXEOHEUfEJLbZcUp2/GFTC3IouzjlfKHmjgaCNKJ4gdYvRvzRD9M21MqhDWUVBx94OXYbiUUslysDLpUqixmSaVfLtDWeD9y3zKDSiAGoSL04CGEKyNd6o/ztds+XfI1s3T6tboa0ZtlFjWUow08k4InwECOpOAIFGTU8rXKPSCr+welCMd8xCUNZATMn0mIa1UR9PQ6zeABu8BLh/F+NyK+7QVWUlBwquLruT0lQM0CvnZ8aikQwfm6VeO1kcInRVcBWy3MRRLj7xuZwmg== 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: On 4/1/25 10:27, Toke Høiland-Jørgensen wrote: ... > 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 I haven't looked into the bit carving, but the rest looks good to me. A few nits below, ... > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index 7745ad924ae2d801580a6760eba9393e1cf67b01..52b5ddab7ecb405066fd55b8d61abfd4186b9dcf 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -227,6 +227,8 @@ static int page_pool_init(struct page_pool *pool, > return -EINVAL; > > pool->dma_map = true; > + > + xa_init_flags(&pool->dma_mapped, XA_FLAGS_ALLOC1); nit: might be better to init/destroy unconditionally, it doesn't allocate any memory. > } > > if (pool->slow.flags & PP_FLAG_DMA_SYNC_DEV) { > @@ -276,9 +278,6 @@ 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); > - > if (pool->slow.flags & PP_FLAG_ALLOW_UNREADABLE_NETMEM) { > netdev_assert_locked(pool->slow.netdev); > rxq = __netif_get_rx_queue(pool->slow.netdev, > @@ -322,7 +321,7 @@ 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 +462,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 (READ_ONCE(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 (READ_ONCE(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 +490,28 @@ 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 (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); Is it an optimisation? bh disable should be reentrable and could just be xa_alloc_bh(). KERN_{NOTICE,INFO} Maybe? > + if (err) { > + WARN_ONCE(1, "couldn't track DMA mapping, please report to netdev@"); That can happen with enough memory pressure, I don't think it should be a warning. Maybe some pr_info? > goto unmap_failed; > + } > > + if (page_pool_set_dma_addr_netmem(netmem, dma)) { > + WARN_ONCE(1, "unexpected DMA address, please report to netdev@"); > + goto unmap_failed; > + } > + > + netmem_set_dma_index(netmem, id); > page_pool_dma_sync_for_device(pool, netmem, pool->p.max_len); > > return true; -- Pavel Begunkov