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 AA671C7115B for ; Fri, 20 Jun 2025 04:12:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F09656B0089; Fri, 20 Jun 2025 00:12:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB9A46B008A; Fri, 20 Jun 2025 00:12:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCF9C6B008C; Fri, 20 Jun 2025 00:12:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id CE4B06B0089 for ; Fri, 20 Jun 2025 00:12:40 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 99B641042E7 for ; Fri, 20 Jun 2025 04:12:40 +0000 (UTC) X-FDA: 83574457680.05.ECC77B8 Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf20.hostedemail.com (Postfix) with ESMTP id 98B891C0003 for ; Fri, 20 Jun 2025 04:12:38 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.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=1750392759; 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=P0HJUqSW2lEuSRuTfVMKpLxpFnHOznp0zgMIXBg1s9MOsBkc1Cc8qlCrlTHNxROPiEkMPO YG59GFG4B8jbW2Nz65FczgVgWNbjD4QjXRIVYqT9sOn0EiRnEax3azxRhP3xY+CAZ9Z2ha doh0VFAfPXYwus2jXxANi2e5pYb7n3E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf20.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750392759; a=rsa-sha256; cv=none; b=xpnW18rOHYJ9d4xSCPlR5d1fpScRZ1bjNtwjrEXGlCCC5mN8nP/HTWuC3G5GPL8nWCZ+cF /xYSCOb1FWpqGgn/l9yU5obO7toerOilr6ysywttuT30f+H6up2LBFGi89WOXiUhBF03Ws A3I4oIRWEEMq6FKRLfmLcYi2AhTFkcA= X-AuditID: a67dfc5b-669ff7000002311f-5e-6854dfb2dd29 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 v6 2/9] page_pool: rename page_pool_return_page() to page_pool_return_netmem() Date: Fri, 20 Jun 2025 13:12:17 +0900 Message-Id: <20250620041224.46646-3-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250620041224.46646-1-byungchul@sk.com> References: <20250620041224.46646-1-byungchul@sk.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0hTcRjG++/8d85xtDguqWMXwqGYdjW03qBEkOiElKF9KaMaenCjeWHe g8JSuoxcV0jnrFnkbcpieZmmlmuZouElqtlFZakQeCG1NZ1Q2yTy28Pzvr/neT+8NCEpEW6g FamZvCpVppSSIiyaWl2+wzRyQr77rjkMdMZaEgzOXKgcNQtBV9OIYH7hCwVz1rckPCl3EKDr K8Twy7hIwHinnQKD6SiMVExgaL3WRID9VhcJRYUuAtoWpim4Yq4SQH+jRgj3F58S0JQ/SsH7 Fh0Jw7V/hDBhKcLQra3GMKKJgk79OnD0TCKwGpsE4LhZRsK9QT0J3wtHEAy+tmMovaxBYGy3 CcHldGeUvhmmogK515MzBFdfPSTgmrXfKE5vyuKeV4VyatsgwZlqbpCcafYuxX392EpyXcUu zDWb5wRcUcE0yf0c/4y5mfYPJGes/4C5Xr2VOu57SnQgiVcqsnnVrshzIvlS85QwvSggV6P/ iPLRp41qRNMsE87ONgSpkY9X/r7TSXo0yQSzNtsC4dF+TBg7Z3+L1UhEE0wdyVprv1CewVom mS3t7fZqzASxlqt9XkDMRLBVdWVoOXQLa3j2yuv7MHvZn1deeAsk7h3n40Lh8r4v210yhj33 EO5i40OJxybcaEFDKeHpZRkzzfZ0tlHLmf5sR5UN30aMdgWu/Y9rV+B6RNQgiSI1O0WmUIbv lOelKnJ3JqalmJD7YSouLiWY0Wx/vAUxNJKuFpvn4+USoSw7Iy/FgliakPqJn3Qdk0vESbK8 C7wq7awqS8lnWNBGGkvXi/c4cpIkTLIskz/P8+m86t9UQPtsyEcPeweq1/QpDbUnBbHRCQMB U8HvouWfi+Mibmt2xe1/sJgWsv3UEWl0WuPLodnTkYaBvLmA7X1+cUtT1fMdO1Ydztm2LzbX 5Yq5lOPc3DWjDupQ+o89s5LHUPwP/4JNjrYzj3wHDxYHJmTqWuxhlTjx0NbkyLGQ5MUYJ35c cn3iK5biDLksLJRQZcj+AhK/HpAsAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA02Sa0hTcRjG+e9cdhwtjkvcwT5Iq4gGmkLGSxfpQ9ShKIJuFFgOPbbhvLCp aJC3LUtr60rUdDGVSqe2WqazzHTzmoahaStLbaUUeEmny8uiphH17eF5f8/zfHkpTOTFgyhF YgqnSpQpJaQAFxzYpgmxDh2Wh42/lECRpZKEirl0uD9sI6DIXINgZn6AD+7mNhJKiz0YFHVr cZi1LGAw0uriQ4V1PwzdG8Wh/nwtBq7L7STotIsYPJ+f4EOurYwHDmMHAa9r9ATcWLiLQW32 MB96nxaRMFj5i4BRuw6HDkM5DkP6ndBqCgRP5xiCZkstDzyXjCRc7zGR8Fk7hKDH4cKhMEeP wNLgJGBxztdR2DLI37medYxNYmx1+TseW2f4yGdN1lT2cZmULXD2YKzVnE+y1ulrfPZDfz3J tt9axNk6m5vH6jQTJDs18h5nJxv6SLb063cea6nuww+KTgi2x3JKRRqn2hQZLZB768aJZN2a dL2pH2Wjt6sLkB/F0JuZH1dbySVN0hsYp3MeW9IBdDjjdrXhBUhAYXQVyTRXDvCXDqvo00xh V8eyxun1jD2vezkgpCOYsioj+lMazFQ8bFz2/egtzFTus+UBkY+ZK9ESf3h/puP2F98A5RvY wFjuiJZszBfVPCnEriCh4T/K8I8y/EeZEGZGAYrEtASZQhkRqo6XZyQq0kNjkhKsyPcT9856 r9rQTO8eO6IpJFkhtM0ckosIWZo6I8GOGAqTBAhL2w/IRcJYWcYZTpV0SpWq5NR2tJrCJWLh 3mNctIg+LUvh4jkumVP9vfIov6BsJBa/ChgNjtNkeRc8Yn1r5ixms3dpzZmRxpT6FMHPrNC4 BP/yK0djzubeXFng+lZ33FMM0mrdudqSvkf5ngdRfXhT594LA1ubsletM6W9iJ6O8suT7zu8 1jsluzixEBf4hijZ0S2lPrUYzD/duTnzIbMbd+12G8P8NZ0n1x5pdEhwtVwWLsVUatlvTOCk IA8DAAA= X-CFilter-Loop: Reflected X-Rspamd-Server: rspam11 X-Rspam-User: X-Rspamd-Queue-Id: 98B891C0003 X-Stat-Signature: j9j9bqm3um97ygmruuj3c8rpmiu4am3b X-HE-Tag: 1750392758-531019 X-HE-Meta: U2FsdGVkX1/fUNH4A6oozcxqEupKZ3Tji1EWw055ngD43rJ1jyiszUGhlDJHOqF13BrHowb9CBstBvSG+a+J+6cphc0YO199EJFhD5liICGTAbb7KZ3GrkRNEnKNQ9D+8AGai/5Lw9mvd3JiWR/ypMLfySuV6a0VIOwZ1ssscTIDKymFA0vuhRHnS7CuZStSi1FBhLgztlcXYcXBELZGq/ihpEfzfkVzVr1+GL5CV8Ywe6oOlMa7K9d7H/f/mViyGwiofY79alnBCcvpCRGsybSSwK4YcNUJCJG/yyXl76+CdkvJ0rHjtBKP8JK6eNl55k7GTMVbf6YA76XZsgGwCLPRClNZE3MXitqN5tnt9wVJzjlRBGc+7fj99SKyijFHmLxpb4y3+wUF7066Sr7+fTMOqqsyeBmDR/vCXTV9Tb2t5tmxjqP1aOc2z7j1Ol6+53lMXpsVkKODKUOaZbCSmFlLteMI3J83JUw5kPOMhqB2yMYU3a7JcfgKnP1uPUT4HDKuYaubQBS/u/MKpHKjPanzb19ri60/U5UY9/1woieWvcXn4pVK0DJvrlOoyePx16cXpY9pRkHipXVnH4EDeZ8Iz02I23NeoJjZCp+Hl7N6HVwhwrN5YhXaI7PHo39rGfE/P1HjSH8q0Ee+DO+KYDl7KTWuCqNsUmP1z54Iy0rZ0mtuJ0AL3vmHESSL0g1sSjkPqNNb2ydXWuPW5UVkiAL9sI4wtKYDeVYCEnSnTo8syTyaSgIDbi5nmT52sjDjySBHC8me8aurhDJBrGMKFURCNbUZ7TzS0hSU1RjnRA2cQ9QJ4omebYAD71vevEXMT1d5AWHtv9u9MPQ4rVxWBz1w8QCykuEDc8/Bg4s9IJMmoxTCepAqdJyGfUa/bWjcwPGqdfNCRY5HzEW0n5O6zIVvwaigR3BAJjr+V1Fm7Ci/zzytMzTVkhhDmzuL+I0mP7rXzL2tPfUvCIGDTl0 Vmz12gvj FQLnq+5xLu3Rpr3AxMo3R2a3Ltx1uIFHxf01MizvAD7kS8nEYclmXgIS0yC3HnxolUtye1kUpCp4K3N7OjE7Q5iGhZIR6lrRXdXksICKHrDbsKhZobeFfxHXl1AMMjoGRP3e13ObSt4QefsY6DSs0qTsC0zRuL3sHHW8Sy1G/g+2RlLYoUlvhLsji+nJm0UGanbAFm2ym9kzIB/KSghP5J+DskHewV/SBcVW6NJGjOU1wSzY/I+97EHKsAaR1qwwvhnaKExqTbh2+ZRaARBDZQe1ARaQwqegsHU/xCG4g76hSsiHZuzY4NLHF3KIfAaqjQWfv 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