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 926FBC83013 for ; Wed, 2 Jul 2025 05:33:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31A0F6B00A0; Wed, 2 Jul 2025 01:33:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CA006B00B0; Wed, 2 Jul 2025 01:33:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1922A6B00B1; Wed, 2 Jul 2025 01:33:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 09E336B00A0 for ; Wed, 2 Jul 2025 01:33:13 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 90A22140749 for ; Wed, 2 Jul 2025 05:33:12 +0000 (UTC) X-FDA: 83618206224.21.2305238 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf05.hostedemail.com (Postfix) with ESMTP id 67010100004 for ; Wed, 2 Jul 2025 05:33:10 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; spf=pass (imf05.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751434391; 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; bh=mzyGPNq+bwchd6DImfWk8lJVxGXqVHL+/6nrGN+UMJU=; b=Pl9r8KJvFQMCWfyy/E81mokvJyVeQnYyfMZ6AfWmv1vgYaE/EVbNOEDk2A7MOP4sJb+6lR jwA3+b+lTvAO7FmsLv2zJ+hkAMuE84IjJ05K3JGwt/KNX0aFo3YawQQdCxqd4lrPq35Bon SFZwNkIudL1+Kvq3FrmslfrPTDVerAY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751434391; a=rsa-sha256; cv=none; b=FEEJ9IxwcNLq3kErQtMUveiASlgKppEMsXtRqSMv2AWMJMDYWAFFJStNE8QnEJMIOPqqJo 7PbFHqxD7M2ip4Ou4XY+BAmdS9CEn5ExP0rbuNxqNWwsf/Vdrej98vspsRlZ4TdF5YzzHk RXm7z82zgJKt3dQ4W7eF2llNO1WmfOQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf05.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com X-AuditID: a67dfc5b-669ff7000002311f-08-6864c4926c6e From: Byungchul Park To: willy@infradead.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel_team@skhynix.com, kuba@kernel.org, almasrymina@google.com, ilias.apalodimas@linaro.org, harry.yoo@oracle.com, hawk@kernel.org, akpm@linux-foundation.org, davem@davemloft.net, john.fastabend@gmail.com, andrew+netdev@lunn.ch, asml.silence@gmail.com, toke@redhat.com, tariqt@nvidia.com, edumazet@google.com, pabeni@redhat.com, saeedm@nvidia.com, leon@kernel.org, ast@kernel.org, daniel@iogearbox.net, david@redhat.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, vbabka@suse.cz, rppt@kernel.org, surenb@google.com, mhocko@suse.com, horms@kernel.org, linux-rdma@vger.kernel.org, bpf@vger.kernel.org, vishal.moola@gmail.com, hannes@cmpxchg.org, ziy@nvidia.com, jackmanb@google.com Subject: [PATCH net-next v8 1/5] page_pool: rename page_pool_return_page() to page_pool_return_netmem() Date: Wed, 2 Jul 2025 14:32:52 +0900 Message-Id: <20250702053256.4594-2-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250702053256.4594-1-byungchul@sk.com> References: <20250702053256.4594-1-byungchul@sk.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0iTcRTG+++9brl4XVGvWpSjlCI1xeoElX4oeL8ERRHddbgXN9JZm9cg 8gaWpJYF1Vy5isx0uZg6Zxcrm3Nikcy0maUym2B4Ia2hrqjNkvr24znneZ7z4dCYREsE00pV Oq9WyVKkpAgXjQfciSi3yhWbHI0bQWc0kFA7kw33hywE6GrMCL7N9lMwbW0n4e5tDwa6t4U4 fDfOYeC2uSioNe2BwaoRHJ4WNWHgKrOTUFLoxeDZ7AQF+ZZqAXSZSwm4OncPg6bcIQq6H+tI GDD8ImCktQSHDu0DHAZL48GmXw6ezjEEVmOTADwXb5JwxaEnYbhwEIHjlQuHirxSBMYWJwHe GV9GRdsAFb+WezU2iXEND/oEXLP2E8XpTRlcffUGrtjpwDhTzQWSM02VU9zH3qckZ7/uxblm y7SAKymYILmv7g84N9nSQ3LGhh6ce623UnsDj4i2y/kUZSavjtqZKFL8aB4nTpWEZpfqe1Eu eh9SjIQ0y8SyeZ6fggW+Pukl/Uwy4azTOYv5eRkTzU672vFiJKIx5iHJWg39lH+wlElmGwyd hJ9xZh1rK/8+HyT2BTnrurA/oavZ2kcv5lnIbGZbbPb5AolvZ/i8lfyzH8h23PjsK6B9BeGs 8ZbEL2M+a0FjBebvZRkLzTZc+fL30CD2ZbUTv4QY7X927T+79j+7HmE1SKJUZabKlCmxkYoc lTI7Mikt1YR8H1N19sdRC5rq2t+KGBpJA8T2d0kKCSHL1OSktiKWxqTLxEtW+SSxXJZzhlen JagzUnhNKwqhcekKcYwnSy5hkmXp/EmeP8WrF6YCWhici47nm/MSdgXHv9ctfnPonCZma1Ia UVR4TFzZV9l/cYf5smyf2zsaeNt9d/c1Ob4uL250xvnkQHXWUFOouSZ1QBhambilrm7v6RO3 3MlofcGug1U9YUsjIg6XTdTXrjFkrkQvVfnPty26vDGuTejeXx7btViQG9Qd9kacENX5LrFi bk6KaxSy6A2YWiP7DeiIuiAtAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA02SbUhTYRTHe3bv7r2OZrclddGkGogkpUkZB4rykz5ESR8KI4Ic8+aWbsqW okbgW1mWlhZm86WV5etsskynmIkudZoYC2tlpc2SCNN8TZ1QmxL57cc5v/P/fzkMIVkmvRml +gKvUcvipJSIFEUcyNxdYIlW7Gl/4QslRgMFtQvJUDliFkJJTSOC2cUhGmYs3RSUP5gnoGQg i4Q54xIB37ocNNSajsFwxRgJrdlNBDhu9lCQm+Uk4PniBA0Z5ioBdJZahfC6MU8Id5YeE9CU NkLDm5YSCj4b/ghhrCOXBKuumoThvFDo0m+G+b5xBBZjkwDmb5RScNump2A0axiBrdNBQnF6 HgJjm10IzgVXRvHLz3SoH+4cnyRwQ/V7AW7WfaKx3pSIn1YF4By7jcCmmmsUNk0X0Pjj21YK 9xQ5SdxsnhHg3MwJCk99+0DiybZBCpd//yXAxoZB8rjktOhgNB+nTOI1QYeiRIrl5p/ChNwd yXn6tygNvfPJQR4Mx+7jiiadlJsp1p+z2xcJN3uxwdyMo5vMQSKGYOsozmIYot2LTWwM12Do E7qZZP24roI5gZvFriD7k9fEaug2rra+fYU92BCuratnpUDickavWqhVfyNnvffVVcC4Cvw5 Y5nEPSZcp5nPiolbSKxbY+n+W7o1lh4RNchLqU5SyZRxIYHaWEWKWpkcKI9XmZDrJyouLeeb 0eyb8A7EMki6XtzeL1dIhLIkbYqqA3EMIfUSe/q6RuJoWUoqr4k/q0mM47UdyIchpVvERyL5 KAkbI7vAx/J8Aq/5txUwHt5piDRsdwQl2ixXYg9f3xCOf1Ruqcuo2nxOlBxz/NGzu3vtLQm2 +rDLuxaGxwoj8fh9iQ/9KuCSfH+gtjgp/sHO1Lkvy5pTS71bwzZuzz6hijjZNF/pYy3znZ3u JS+ekcseho+kn/ce7C+ccFr37hiI9gRV26h8yjPVfPR3/jrPwAWLlNQqZMEBhEYr+wu8Ulhd DwMAAA== X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 67010100004 X-Stat-Signature: t9icndieskb7apwzp8gotf5xke38oz7j X-HE-Tag: 1751434390-866662 X-HE-Meta: U2FsdGVkX1/WSNGUvljmY58OIot3x3Ce2rRckEmhN0+V4457NiLtH/FteL4Fjt+kA37MDBkYXwinHbrHuS9RxIeMJ8AJMk8Jpy4hVZ11n10i13VwAsUSy1yzovRuzxEFZGDSa+E5yY3XtcgOea7lU4MZhtfWJ/1nKG53GKwB55pxgGj8K+vn7WqcymKj12FPFXUYQvCwN+5aYgJtpoUX90vlX2yKD2u1iCOtVNqJxjDo65ubRFMdRL31KC4RL2FTJlo6mOnh67JQnV8jsS3zfHISuuE7BHf/PnKddyrs9JowJTYrtD7hgT/HopCS2HneGZhSTpq1p1DeEB0yaFgeecD8iPTVdHfLuB5N9VdPSQlmRt/sgByqSCQUcbpeMcCHeaKT7h3FsWybWVfkncd5poKG4H22LgwKHyUKVeGraEkDRAHoaFBI8CO+Ujy+AUHN+qyHqtapdPJN/o06B9WOqcD3avOQ3OCrxPLeqD9zLvXQuoVyEwqr/1UfbwmThfqvABc5YPt0xCI8+CpHu0MygCujn7Wn7gx6uWRW/3uzdfGWuN4f8vN+uNHucMK1DCfytmIV3DBKNyFMFkgm/St1m7qLzXCuOXNiD7BdGc9IZ7RZLZRTAuM/mS8q+e0wz6sD11HMnlLOYHJNqIG1O25/+YHl1A585dx2/+8XjV4oezaOjkZrNA/atyx2Mgf+40mb+PBIZ3TPywvBcS3OKXrOVqGOYN1QhDGNvqQ4vzfSUL1A3Eg92nVfcU5/Wqn0giGETrlxmcskXilLA6NzQtcoRqf0v+KHm3+C3Q/6KacNkBkBCaxcXV1SkPz2PFkF85xdJZy1lTwCuZAu0+ye7MoQxo5sII6W9KsFi5UYqtkAiNTclf0JP7WCQKLu5EvUDjUL5CIGj5wf8JXinPmzbO31yZG3voCzi1kyKweO+g9EnpPAd547C8HDDpgbvQmwhjo9/w1JSG6RqQJs7yJKhHJ pXSYrjMa ddblYZ/vbaUToApqQRaa0Hbj/W6RecNfZJQcZJU9u9PmmbLr5AAMH+qWCwGGPFE1TX4zPmph8Ic/TjmvmvTwjzYQY/bm6qEHxmhr2mgx8uI76zqYp41yxeRLg+r2Nz28bZ/JZ/KfkRp8jPyXpRRJ4zf80JEhQ6S9pTV8raAckDua72mVma6rxusjJddQKU8VLiGjtiSvHwiW1WWNpO58tQrjSWktbuWb842iNIfJnDs/DzMHV5QcLW1q/zQLS2xVNKSBWdFnFyA8GVCA5m2M7PibrBRc6mgqFqz7nKfCjkibFnbY= 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: Now that page_pool_return_page() is for returning netmem, not struct page, rename it to page_pool_return_netmem() to reflect what it does. Signed-off-by: Byungchul Park Reviewed-by: Mina Almasry Reviewed-by: Toke Høiland-Jørgensen Reviewed-by: Pavel Begunkov Reviewed-by: Ilias Apalodimas --- net/core/page_pool.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index ba7cf3e3c32f..3bf25e554f96 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -371,7 +371,7 @@ struct page_pool *page_pool_create(const struct page_pool_params *params) } EXPORT_SYMBOL(page_pool_create); -static void page_pool_return_page(struct page_pool *pool, netmem_ref netmem); +static void page_pool_return_netmem(struct page_pool *pool, netmem_ref netmem); static noinline netmem_ref page_pool_refill_alloc_cache(struct page_pool *pool) { @@ -409,7 +409,7 @@ static noinline netmem_ref page_pool_refill_alloc_cache(struct page_pool *pool) * (2) break out to fallthrough to alloc_pages_node. * This limit stress on page buddy alloactor. */ - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); alloc_stat_inc(pool, waive); netmem = 0; break; @@ -712,7 +712,7 @@ static __always_inline void __page_pool_release_page_dma(struct page_pool *pool, * a regular page (that will eventually be returned to the normal * page-allocator via put_page). */ -void page_pool_return_page(struct page_pool *pool, netmem_ref netmem) +static void page_pool_return_netmem(struct page_pool *pool, netmem_ref netmem) { int count; bool put; @@ -826,7 +826,7 @@ __page_pool_put_page(struct page_pool *pool, netmem_ref netmem, * will be invoking put_page. */ recycle_stat_inc(pool, released_refcnt); - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); return 0; } @@ -869,7 +869,7 @@ void page_pool_put_unrefed_netmem(struct page_pool *pool, netmem_ref netmem, if (netmem && !page_pool_recycle_in_ring(pool, netmem)) { /* Cache full, fallback to free pages */ recycle_stat_inc(pool, ring_full); - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); } } EXPORT_SYMBOL(page_pool_put_unrefed_netmem); @@ -912,7 +912,7 @@ static void page_pool_recycle_ring_bulk(struct page_pool *pool, * since put_page() with refcnt == 1 can be an expensive operation. */ for (; i < bulk_len; i++) - page_pool_return_page(pool, bulk[i]); + page_pool_return_netmem(pool, bulk[i]); } /** @@ -995,7 +995,7 @@ static netmem_ref page_pool_drain_frag(struct page_pool *pool, return netmem; } - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); return 0; } @@ -1009,7 +1009,7 @@ static void page_pool_free_frag(struct page_pool *pool) if (!netmem || page_pool_unref_netmem(netmem, drain_count)) return; - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); } netmem_ref page_pool_alloc_frag_netmem(struct page_pool *pool, @@ -1076,7 +1076,7 @@ static void page_pool_empty_ring(struct page_pool *pool) pr_crit("%s() page_pool refcnt %d violation\n", __func__, netmem_ref_count(netmem)); - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); } } @@ -1109,7 +1109,7 @@ static void page_pool_empty_alloc_cache_once(struct page_pool *pool) */ while (pool->alloc.count) { netmem = pool->alloc.cache[--pool->alloc.count]; - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); } } @@ -1253,7 +1253,7 @@ void page_pool_update_nid(struct page_pool *pool, int new_nid) /* Flush pool alloc cache, as refill will check NUMA node */ while (pool->alloc.count) { netmem = pool->alloc.cache[--pool->alloc.count]; - page_pool_return_page(pool, netmem); + page_pool_return_netmem(pool, netmem); } } EXPORT_SYMBOL(page_pool_update_nid); -- 2.17.1