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 A727BC4167B for ; Mon, 11 Dec 2023 03:53:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 212A56B0098; Sun, 10 Dec 2023 22:53:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C22C6B0099; Sun, 10 Dec 2023 22:53:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 062346B009A; Sun, 10 Dec 2023 22:53:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E66686B0098 for ; Sun, 10 Dec 2023 22:53:17 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id ACEB0160587 for ; Mon, 11 Dec 2023 03:53:17 +0000 (UTC) X-FDA: 81553167234.25.8AF7CC2 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf11.hostedemail.com (Postfix) with ESMTP id C285040017 for ; Mon, 11 Dec 2023 03:53:15 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MmMq8ve7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702266795; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0gkCO+cmYizzxtKpmJJFZh1hseverSK4jjEXH+6EVns=; b=VuxfP8pVIyj4OkJzyoirA/X1Y5ikakJowH9vA0oDNzWhrYF9QkxDUu7mIZqpZuZQQ95kKd g37G4PYGIjBEIt96i4MOY6aQ6A/0zM4+9SXhwfKib3WDEioe166+YL0jsNxtele1avDurn RP4INBXO5YxcefyyuYFEBVkFn5+8buk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MmMq8ve7; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of liangchen.linux@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=liangchen.linux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702266795; a=rsa-sha256; cv=none; b=SLJ7QbDYUVWpbThYo6aAjh+jRQeuiD9SOxLnq6blvjba0uiX/dyCbvP42lBMs/fib/Qw9H NuiCYujdTBk67JVJ4KfYjiPRu2op+mqXekmBdNq35ZhWa45W39KumCXJKffLQs2cXSqPSg fpMeFCFfHazuRhsOk/FKLMbivM052VY= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d06d42a58aso37528025ad.0 for ; Sun, 10 Dec 2023 19:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702266794; x=1702871594; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0gkCO+cmYizzxtKpmJJFZh1hseverSK4jjEXH+6EVns=; b=MmMq8ve7SW2RZVGXjtz40sAFh1Q9oPoBLiELfRc2rIEjE6NPlVzKO7dzonA49A+2xT Qpy1sS27jB4u0SoiAMb5Xoil+3umBwjGTXVxBe3UF97gzrBZLYVPxjvyOpaW+E1c5yNs Dl/iU3FXESId7MeBksO3z27ORWbIwVmq5HY9DT4H/6AOHzhXQ2/bb8sse/8MQr8tzlVt eK9JGdOGh0N2kAuBgFYGeX1QTvXyIxtQ/JM/air6EXjpk+5U8iFuTkGAZu/tiOL9Vq5C JLOOVwoRb+Gzb4O5J5dTpX9cRxoQlxzX65QgTMGjHlCx5eDoKAAiIWAzQFqkOTIlTBnY F0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702266794; x=1702871594; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0gkCO+cmYizzxtKpmJJFZh1hseverSK4jjEXH+6EVns=; b=ukezJ1NHYAejDGLFXmowO7scCRRAzh/L2+PXqk/IWVyQii6DvcjvdIJAQKtmS6ex9j 2clX64nSfOFOrFOAALtnsOankH3OxCRLikWHhcBcFfg7ViHzaLRvTVzFxloXOCWQKKux /LGCctXUG2ZQpTKKqW1JWKTxJ50NsiWqhE66D6XZnlEcbQiAIlb2T2POKxZKLoiXxw6P OZgd9l700ds7Lb7t5TUVANUXPH2LkaX+huN8ZPXEJYSs5HDGNtvPZrfOx5e7y3QfnZN5 YnVZWnx9NBebsaf4HqcvJakwC7he99zINxr2WTpuTdlUncTJCp34GEixojABlkrkrTYc xHgA== X-Gm-Message-State: AOJu0YxzC2G3f94KyanvWLb2OHcPrweTRM6GfkKDWfB0eFR4X0iQ3OGP vufgOkDEMkm15NUq6UzHDfo= X-Google-Smtp-Source: AGHT+IEXf6IbJoR8Iz9MNTsR6P223Ynd+dcUtTQl8p+o+6SoIZRPusRJS8EGhxpR+3WfEFg3O3977A== X-Received: by 2002:a17:902:a5c7:b0:1d0:7844:5086 with SMTP id t7-20020a170902a5c700b001d078445086mr3242096plq.7.1702266794499; Sun, 10 Dec 2023 19:53:14 -0800 (PST) Received: from localhost.localdomain ([89.187.161.180]) by smtp.gmail.com with ESMTPSA id b8-20020a170903228800b001d052d1aaf2sm5411491plh.101.2023.12.10.19.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 19:53:13 -0800 (PST) From: Liang Chen To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, hawk@kernel.org, ilias.apalodimas@linaro.org, linyunsheng@huawei.com Cc: netdev@vger.kernel.org, linux-mm@kvack.org, jasowang@redhat.com, almasrymina@google.com, liangchen.linux@gmail.com Subject: [PATCH net-next v8 1/4] page_pool: transition to reference count management after page draining Date: Mon, 11 Dec 2023 11:52:40 +0800 Message-Id: <20231211035243.15774-2-liangchen.linux@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231211035243.15774-1-liangchen.linux@gmail.com> References: <20231211035243.15774-1-liangchen.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C285040017 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: p6wqf138kaqba4qapqyjiqkxmy6k3ofu X-HE-Tag: 1702266795-235898 X-HE-Meta: U2FsdGVkX1+sUNh1BjxHuW7h9bp/kyDGVRBabn0Rkz7b9Ojc16uHZK8Q6PjWxStXFhZP5ZpgXcHd4OAepGPtDoxrRijxzrM85ipZANbEYKS/RLA8oGH4M1Dd0oTRH6LXbPcr8uFoabENLZGNielc4VbmLC2utuWI0Sa8NMmtM8eaP4p54eflz7VcXhUOZ/cvb4nISCb81b/ywi9U7wzAJwWvuBDyu/pbo1mOLT5jT6h0G92THnfF7rpdzuT5CPq+LaKU7trku9raYj09Eho8s/xqLm46HKWvi5u9Y+l/npCmgR0x6+JA4RBZqEvfVTPeG1W70vuYIaARKR2cxvJ0VpUaTvZ6dUtBr3Gyz42ke4MepdXaRLLydhNVCqV/WO/EudYW3rxgW7LX6jFU7tuETnk96hdHneAQganWVGoFW9gm3DRhqU+a+7ZWP2X6VMYfvEKPlD8KkP7Eyrmgg/qDnCSvsXhoZBZ+f1gBJxx/QsBmrqyK08bCwNRmKHveNUN16+lXxc237xI5tM/0kx069AEyWJqBZnhMb9NJNwyXVmxBrykernICIkyMgSxjtiKVb8oSDZbFnrSgpqWJaRHjsS/GcTbJPLZ/oyM7E5kXbiuDQV3lVkLrUVJPdm15cMHoNL2mr6QQE6CUF3Rm17L9br6isUZ2+boRAlCVK6J6VKT7b5jiSn61/l3hy86Eb3MOzEG/cERz9Wx+En+Tlng89RITW8UTW08U+VK/fqrEmG62Z7GMzRHKBZmSqB63l5hBIpF5qB0Hbgdz0+Xo5h4uLxYF55qq9Qg6Qlho1Tac/ZJJfFbTjwQjqTzE2zEPpFD4FKM1KaOZ4hUFH68uoHif4OIdFY+Ss04uPAxJBwxYb45t9Mr7tezbfL/wSAhZ+VtrdT/2o4CNMJfrJXRzsK6AINqoFS06UZlKhccvibZyWMc7U84HhKDSSXg+tIGvCjdjvKnv/yMj+l1g64rh3x/ 64ls7ttz 4qjdbw4S/klF3AQz0goHiAJdksvNOqlsENIXKX12cD2HBHKdGZqhXT9olycd9IDilJ8FZ6EZMDE3bcT38bt0A9vCut/hNLvn5UweVXu9UG/GUFhIKzKy/b61x4R823NP1hdNRegpZnuM4oKDtX59t3rdWmRPoWIbdNHwtE90+nNU0CIDyh+j/sJjC/EtFqX1LHchxGpFHAjOS8ioJgDU3ZooE5hTgrGrhr8KzKfZnj/z4Pmb9L2ZvbaLLkdCRZ3zjzFzTwORDAglGEmobBi+EEtsOK70DCgBvyFsueL2o9jbK46s30tZHyDa3jXywwLGmbrqipKZOJWSmMQslzWbOl5Kb+j4jOti8/OBwOzv8NnSDQxvKPBkxnawurQpcPyqnWZbyB17Z6/2n/3q2jwce2Y3a5d/HKxh4cFJvmrDX+a4719TjvduDN0sC0Ky734pp/u0ZAIEyB/7wGRwzgVjlsmAYC/2HJu7uTjhA5SqO7yB+B5gGZLxsEE0lZWsWt4DuTf8yemGMzwByKeYu4ccNCLcLoH5W8RWSZIsBih1egmWruE/8W5pgIPy1/x2Jyi9giKXBP4tcHISzw30d/EIcc1D0mffroc9QX8gyr6ry2dIo3a6nhOP8lLiW+OGD0/BVugFzg562BoJKzRDx0OGEWNn7eRMmicGdLGQ586BRN/liTwU= 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: To support multiple users referencing the same fragment, 'pp_frag_count' is renamed to 'pp_ref_count', transitioning pp pages from fragment management to reference count management after draining based on the suggestion from [1]. The idea is that the concept of fragmenting exists before the page is drained, and all related functions retain their current names. However, once the page is drained, its management shifts to being governed by 'pp_ref_count'. Therefore, all functions associated with that lifecycle stage of a pp page are renamed. [1] http://lore.kernel.org/netdev/f71d9448-70c8-8793-dc9a-0eb48a570300@huawei.com Signed-off-by: Liang Chen Reviewed-by: Yunsheng Lin --- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 4 +- include/linux/mm_types.h | 2 +- include/net/page_pool/helpers.h | 60 +++++++++++-------- include/net/page_pool/types.h | 6 +- net/core/page_pool.c | 12 ++-- 5 files changed, 46 insertions(+), 38 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 8d9743a5e42c..98d33ac7ec64 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -298,8 +298,8 @@ static void mlx5e_page_release_fragmented(struct mlx5e_rq *rq, u16 drain_count = MLX5E_PAGECNT_BIAS_MAX - frag_page->frags; struct page *page = frag_page->page; - if (page_pool_defrag_page(page, drain_count) == 0) - page_pool_put_defragged_page(rq->page_pool, page, -1, true); + if (page_pool_unref_page(page, drain_count) == 0) + page_pool_put_unrefed_page(rq->page_pool, page, -1, true); } static inline int mlx5e_get_rx_frag(struct mlx5e_rq *rq, diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 957ce38768b2..64e4572ef06d 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -125,7 +125,7 @@ struct page { struct page_pool *pp; unsigned long _pp_mapping_pad; unsigned long dma_addr; - atomic_long_t pp_frag_count; + atomic_long_t pp_ref_count; }; struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index 4ebd544ae977..d0c5e7e6857a 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -29,7 +29,7 @@ * page allocated from page pool. Page splitting enables memory saving and thus * avoids TLB/cache miss for data access, but there also is some cost to * implement page splitting, mainly some cache line dirtying/bouncing for - * 'struct page' and atomic operation for page->pp_frag_count. + * 'struct page' and atomic operation for page->pp_ref_count. * * The API keeps track of in-flight pages, in order to let API users know when * it is safe to free a page_pool object, the API users must call @@ -214,69 +214,77 @@ inline enum dma_data_direction page_pool_get_dma_dir(struct page_pool *pool) return pool->p.dma_dir; } -/* pp_frag_count represents the number of writers who can update the page - * either by updating skb->data or via DMA mappings for the device. - * We can't rely on the page refcnt for that as we don't know who might be - * holding page references and we can't reliably destroy or sync DMA mappings - * of the fragments. +/** + * page_pool_fragment_page() - split a fresh page into fragments + * @page: page to split + * @nr: references to set + * + * pp_ref_count represents the number of outstanding references to the page, + * which will be freed using page_pool APIs (rather than page allocator APIs + * like put_page()). Such references are usually held by page_pool-aware + * objects like skbs marked for page pool recycling. * - * When pp_frag_count reaches 0 we can either recycle the page if the page - * refcnt is 1 or return it back to the memory allocator and destroy any - * mappings we have. + * This helper allows the caller to take (set) multiple references to a + * freshly allocated page. The page must be freshly allocated (have a + * pp_ref_count of 1). This is commonly done by drivers and + * "fragment allocators" to save atomic operations - either when they know + * upfront how many references they will need; or to take MAX references and + * return the unused ones with a single atomic dec(), instead of performing + * multiple atomic inc() operations. */ static inline void page_pool_fragment_page(struct page *page, long nr) { - atomic_long_set(&page->pp_frag_count, nr); + atomic_long_set(&page->pp_ref_count, nr); } -static inline long page_pool_defrag_page(struct page *page, long nr) +static inline long page_pool_unref_page(struct page *page, long nr) { long ret; - /* If nr == pp_frag_count then we have cleared all remaining + /* If nr == pp_ref_count then we have cleared all remaining * references to the page: * 1. 'n == 1': no need to actually overwrite it. * 2. 'n != 1': overwrite it with one, which is the rare case - * for pp_frag_count draining. + * for pp_ref_count draining. * * The main advantage to doing this is that not only we avoid a atomic * update, as an atomic_read is generally a much cheaper operation than * an atomic update, especially when dealing with a page that may be - * partitioned into only 2 or 3 pieces; but also unify the pp_frag_count + * referenced by only 2 or 3 users; but also unify the pp_ref_count * handling by ensuring all pages have partitioned into only 1 piece * initially, and only overwrite it when the page is partitioned into * more than one piece. */ - if (atomic_long_read(&page->pp_frag_count) == nr) { + if (atomic_long_read(&page->pp_ref_count) == nr) { /* As we have ensured nr is always one for constant case using * the BUILD_BUG_ON(), only need to handle the non-constant case - * here for pp_frag_count draining, which is a rare case. + * here for pp_ref_count draining, which is a rare case. */ BUILD_BUG_ON(__builtin_constant_p(nr) && nr != 1); if (!__builtin_constant_p(nr)) - atomic_long_set(&page->pp_frag_count, 1); + atomic_long_set(&page->pp_ref_count, 1); return 0; } - ret = atomic_long_sub_return(nr, &page->pp_frag_count); + ret = atomic_long_sub_return(nr, &page->pp_ref_count); WARN_ON(ret < 0); - /* We are the last user here too, reset pp_frag_count back to 1 to + /* We are the last user here too, reset pp_ref_count back to 1 to * ensure all pages have been partitioned into 1 piece initially, * this should be the rare case when the last two fragment users call - * page_pool_defrag_page() currently. + * page_pool_unref_page() currently. */ if (unlikely(!ret)) - atomic_long_set(&page->pp_frag_count, 1); + atomic_long_set(&page->pp_ref_count, 1); return ret; } -static inline bool page_pool_is_last_frag(struct page *page) +static inline bool page_pool_is_last_ref(struct page *page) { - /* If page_pool_defrag_page() returns 0, we were the last user */ - return page_pool_defrag_page(page, 1) == 0; + /* If page_pool_unref_page() returns 0, we were the last user */ + return page_pool_unref_page(page, 1) == 0; } /** @@ -301,10 +309,10 @@ static inline void page_pool_put_page(struct page_pool *pool, * allow registering MEM_TYPE_PAGE_POOL, but shield linker. */ #ifdef CONFIG_PAGE_POOL - if (!page_pool_is_last_frag(page)) + if (!page_pool_is_last_ref(page)) return; - page_pool_put_defragged_page(pool, page, dma_sync_size, allow_direct); + page_pool_put_unrefed_page(pool, page, dma_sync_size, allow_direct); #endif } diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index e1bb92c192de..6a5323619f6e 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -224,9 +224,9 @@ static inline void page_pool_put_page_bulk(struct page_pool *pool, void **data, } #endif -void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, - unsigned int dma_sync_size, - bool allow_direct); +void page_pool_put_unrefed_page(struct page_pool *pool, struct page *page, + unsigned int dma_sync_size, + bool allow_direct); static inline bool is_page_pool_compiled_in(void) { diff --git a/net/core/page_pool.c b/net/core/page_pool.c index df2a06d7da52..106220b1f89c 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -650,8 +650,8 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, return NULL; } -void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, - unsigned int dma_sync_size, bool allow_direct) +void page_pool_put_unrefed_page(struct page_pool *pool, struct page *page, + unsigned int dma_sync_size, bool allow_direct) { page = __page_pool_put_page(pool, page, dma_sync_size, allow_direct); if (page && !page_pool_recycle_in_ring(pool, page)) { @@ -660,7 +660,7 @@ void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, page_pool_return_page(pool, page); } } -EXPORT_SYMBOL(page_pool_put_defragged_page); +EXPORT_SYMBOL(page_pool_put_unrefed_page); /** * page_pool_put_page_bulk() - release references on multiple pages @@ -687,7 +687,7 @@ void page_pool_put_page_bulk(struct page_pool *pool, void **data, struct page *page = virt_to_head_page(data[i]); /* It is not the last user for the page frag case */ - if (!page_pool_is_last_frag(page)) + if (!page_pool_is_last_ref(page)) continue; page = __page_pool_put_page(pool, page, -1, false); @@ -729,7 +729,7 @@ static struct page *page_pool_drain_frag(struct page_pool *pool, long drain_count = BIAS_MAX - pool->frag_users; /* Some user is still using the page frag */ - if (likely(page_pool_defrag_page(page, drain_count))) + if (likely(page_pool_unref_page(page, drain_count))) return NULL; if (page_ref_count(page) == 1 && !page_is_pfmemalloc(page)) { @@ -750,7 +750,7 @@ static void page_pool_free_frag(struct page_pool *pool) pool->frag_page = NULL; - if (!page || page_pool_defrag_page(page, drain_count)) + if (!page || page_pool_unref_page(page, drain_count)) return; page_pool_return_page(pool, page); -- 2.31.1