From patchwork Thu Jan 5 21:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13090565 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 1F53AC54EBD for ; Thu, 5 Jan 2023 21:47:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3224E94000C; Thu, 5 Jan 2023 16:46:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AA8E940007; Thu, 5 Jan 2023 16:46:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1728894000C; Thu, 5 Jan 2023 16:46:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F301C940007 for ; Thu, 5 Jan 2023 16:46:56 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D1EA080A45 for ; Thu, 5 Jan 2023 21:46:56 +0000 (UTC) X-FDA: 80322080832.20.C1BE223 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 56DE8C000A for ; Thu, 5 Jan 2023 21:46:54 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="uV5/9afY"; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672955215; a=rsa-sha256; cv=none; b=uZG7C5misFi+TdYjCjN5+OxTS8TPu/3wSV0sqICcopFdM93PplHkxnps5Qo6Y7OEqsGlR+ 3+bVX5myL55N/XSCcklICtTXZ2uARg2Ka/wtJbZY1gfX8sTWpii+vs/rm4Vmosf6p14qyA XiTAWiFu/bUDC1ga58XjJOr+o99CgjM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="uV5/9afY"; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672955215; 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=JiZMgS7pP8K35sUweK//q6lTVK6Ins4aBIFLXYHxMXM=; b=StclnW8uKS5l+rqAsQ8yiNAfqzGiQn6JCP9TdPTbxlJAY0f3hRa5mLhoOAnMnJVqT1xs7y kB88s/Vwk+cqD+noFU1HgRl4aKDIU9bt5qHUB/Azd5+tkWnd8+yNBV7MNdYQlD66QmTH4A I70an84OVkrKKTvRAaiTUR4LkPDa5CU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=JiZMgS7pP8K35sUweK//q6lTVK6Ins4aBIFLXYHxMXM=; b=uV5/9afYQTK6Ax4FZjDPpMUM37 LPW3S7HgMGYEoWN149Ks4YyYSFd62TzasTqA0XLNdbQhvSOO7x1ioDOrBVe/1tEwhgvtpzYlA81U/ 0vU4/lkVOAeD7xVEnE5Y14DRi3c3gPVyCOyQLrE6/AqWkkiH4zPO1+MTVyN1fNDKUZ/GMTVR0svHU F1lFCFJhcG/mC2I6dRqcRLd481TY87Ihvb2toeuTxhOI6pDAxfMTXjJhwyjCr8ku2mceS/cgW2Q2N DKlMmDi/FFO75wJktAPF+uPclhXSmvOEAj74/z1AxkICFNWkqkHQVrs5ICM5audupzRE8L8j87z5u Y8163Y0g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4H-00GWn7-QL; Thu, 05 Jan 2023 21:46:33 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt Subject: [PATCH v2 07/24] page_pool: Convert __page_pool_put_page() to __page_pool_put_netmem() Date: Thu, 5 Jan 2023 21:46:14 +0000 Message-Id: <20230105214631.3939268-8-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230105214631.3939268-1-willy@infradead.org> References: <20230105214631.3939268-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 56DE8C000A X-Stat-Signature: psgngfnmqkrz1q1xns4ha9pui1hik7jj X-HE-Tag: 1672955214-989095 X-HE-Meta: U2FsdGVkX1+VAO4qdbBpa+si/4C2Y3/Q+0Kk80XXMuLUu6rko5gyxFNB042I5GxrE2687cjb4EwUtUXBMsQjy3V1Lhk5tTDv9jJCkMbSndyUp7xhNvxe3Oi+wnkqJTfAcjTDcNmpvZiow+GKFbFR/iz/XOCQ2QjSrvhnWRX+NjKBoC71NJlhI5u0dHqlP5oEL23Rwr/Pla7Z2s1Avd9rQiePT2tNGTeVBUWW40M+Kgw3XzTq7wDD6Y7kOSsIe7wpHdDghDPbqNM6tVDH/d4KamRKCkbfj0fHo2bjHwKD+J8hHbEIYirC1y36FF2YBXKbSqTRuUlB8GVCzhz/Sv7hk15czamNozvFTmy6bTvFV1nJCKd4c+BrvtFakWAh+56WiLgxI26DPtX4I6YguHN801fFUC2cThINts+OBaaWWmwjYL4fHi8GHdUgZM8rReXrCedlVM9Y7AXKfDsy62hmYe0+0AOFqTFbLHVyq0O7lLInoAJeFbM+6FFXmawkDy04d/CuJ+VbR1ZjsIpdRlWRnKcLRywvbtr+QQFVgcv8vqOdLCiiV3hjU3HZ6QDGXib5+T8aiXV5n+R8SmIyhMLOOqFmy3vgoQaByT/d/MiO7vIUCZsb19woDOCl2TVEZWibv/k/XZqCd3ERRt8T2yAJzl7iBbcs3l1XhGzO85ITToh2EQ5FpMgcp1FpMQ0nIKHuEKRWXUOg+eAmPBZIHDWBZts9c5DVC6e7+XXNhB4iCbookhi9zA7K4+CXxW9AwEw0ceQ1RYK2jmIt5l7cfVwxBzbc6nqEkb3KDxzi05GMn/IZEAwmBQnLz344SnCaMTwMnRjexcTBiGjtS1IbXEVy9hZxbsxVbsgkGtpTT8YEXd1D6/MGQoW1nIgTzBodK5t/Nd+STLD0lC6/18CkzZz5XxVIuyg4a8p5lHMmkiFAIlzdbgfEgiQ9PA== 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: Removes the call to compound_head() hidden in put_page() which saves 169 bytes of kernel text as __page_pool_put_page() is inlined twice. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Jesper Dangaard Brouer Reviewed-by: Ilias Apalodimas --- net/core/page_pool.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index b606952773a6..8f3f7cc5a2d5 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -558,8 +558,8 @@ static bool page_pool_recycle_in_cache(struct page *page, * If the page refcnt != 1, then the page will be returned to memory * subsystem. */ -static __always_inline struct page * -__page_pool_put_page(struct page_pool *pool, struct page *page, +static __always_inline struct netmem * +__page_pool_put_netmem(struct page_pool *pool, struct netmem *nmem, unsigned int dma_sync_size, bool allow_direct) { /* This allocator is optimized for the XDP mode that uses @@ -571,19 +571,20 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, * page is NOT reusable when allocated when system is under * some pressure. (page_is_pfmemalloc) */ - if (likely(page_ref_count(page) == 1 && !page_is_pfmemalloc(page))) { - /* Read barrier done in page_ref_count / READ_ONCE */ + if (likely(netmem_ref_count(nmem) == 1 && + !netmem_is_pfmemalloc(nmem))) { + /* Read barrier done in netmem_ref_count / READ_ONCE */ if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) - page_pool_dma_sync_for_device(pool, page, + page_pool_dma_sync_for_device(pool, netmem_page(nmem), dma_sync_size); if (allow_direct && in_serving_softirq() && - page_pool_recycle_in_cache(page, pool)) + page_pool_recycle_in_cache(netmem_page(nmem), pool)) return NULL; /* Page found as candidate for recycling */ - return page; + return nmem; } /* Fallback/non-XDP mode: API user have elevated refcnt. * @@ -599,13 +600,21 @@ __page_pool_put_page(struct page_pool *pool, struct page *page, * will be invoking put_page. */ recycle_stat_inc(pool, released_refcnt); - /* Do not replace this with page_pool_return_page() */ - page_pool_release_page(pool, page); - put_page(page); + /* Do not replace this with page_pool_return_netmem() */ + page_pool_release_netmem(pool, nmem); + netmem_put(nmem); return NULL; } +static __always_inline struct page * +__page_pool_put_page(struct page_pool *pool, struct page *page, + unsigned int dma_sync_size, bool allow_direct) +{ + return netmem_page(__page_pool_put_netmem(pool, page_netmem(page), + dma_sync_size, allow_direct)); +} + void page_pool_put_defragged_page(struct page_pool *pool, struct page *page, unsigned int dma_sync_size, bool allow_direct) {