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 5C25AC4708E for ; Thu, 5 Jan 2023 21:46:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 134E48E0008; Thu, 5 Jan 2023 16:46:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5F1A8E000B; Thu, 5 Jan 2023 16:46:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9B5BF900003; Thu, 5 Jan 2023 16:46:35 -0500 (EST) 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 5C9008E000C for ; Thu, 5 Jan 2023 16:46:35 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2CCF680AC5 for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) X-FDA: 80322079950.02.79F4882 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf16.hostedemail.com (Postfix) with ESMTP id B5772180009 for ; Thu, 5 Jan 2023 21:46:33 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=kijQyTE0; spf=none (imf16.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=1672955193; 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=p5t0IupfGZ8HBYmR0Bw0RCbwAiZ9Cv0/cS4279RSxzE=; b=ow5sk6rO4b0l82IRjeclB+ReW3hIcwmc/txIntJPCPszNKkgoyVZQvqIqeC1fnmTNemWtu eUZn6HgWBgD5wJTOxJG3lZYapfJuYSyd589v5hh/khtOVhs5pgVGL+C3NPprosetiiSXhW IJIgoW0Rqj1S9YpHH+ncp9O78S3qCbI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=kijQyTE0; spf=none (imf16.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=1672955193; a=rsa-sha256; cv=none; b=nIm+ZONP0uEoL1rN4A1dSvvGqS8VKENUQObaXqyo5dmM/LsHoJa5/rK3iulTqLXkxMnWZE qNByt3T11beoH4uf4lgevsLXSMD3A4pIW7LdY1LYiSF6mBldjCn+rFrSC7QPt479822Nwr 8AIivnnEJWf1QcK83tkH5mNVoH9tkN4= 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=p5t0IupfGZ8HBYmR0Bw0RCbwAiZ9Cv0/cS4279RSxzE=; b=kijQyTE0/Lb9PNYRHFa303SD6U +cJs9NuYnPxcz9At/QCu1cEgTUutEla/Q3tecOIoWO7aVLOaEk3rUCa9OFTqIu1U0zSan+ati1SiQ IpDQ4SpgmuhWmkPuaqKIiDsfIrBwIBIkLo+WKs9jmBQjc/eCN/kMT43FIYn19W+dicGRPV5WNejaX v3Z1LBZ5NKpy5QM5xmbMVoaevrqDuux3fc+jdhT92SW3f1WXEbiM/1CNY1M1w5SZQMkHAQDlM0St6 VhcysE+jDsobaB2N2M2yRBslriQr99yuEYqqbFIVlN5g6b1r/jA59gBTwOKy2ikP7tIYYfH+w6dyF L1hOksXA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4J-00GWo5-3D; Thu, 05 Jan 2023 21:46:35 +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 18/24] page_pool: Convert frag_page to frag_nmem Date: Thu, 5 Jan 2023 21:46:25 +0000 Message-Id: <20230105214631.3939268-19-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 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B5772180009 X-Rspam-User: X-Stat-Signature: nxaa89ra874gfkhkhuoiznsxsbme36rm X-HE-Tag: 1672955193-95263 X-HE-Meta: U2FsdGVkX1/oapuq8ky7bvP2ewRjM7sCzpImXTwJ1wO7AyfK0cebN0Q7Cvwd31zOSBQCMB/+hcVBG5UNiUI6wUrUsTQvenPCCQji/OZ/nb3zab5fyooINJypTelQnwgoz3WzfoTfbQfu3ZD5XHmRsTrippirTVmKcAnV44mgup4eTCG1iJKbRTTvzTneJ9O0GGBt61ctqGJjx+fYLhZByedB9QElasgKjF0A8omily8BhFJHv1hkpKSYd6e5PgoOEb4v9X/KRUtBe8FWzLZFFEbfAdDig62sBM5rqgAaKBIAQeSsJ0i70jbNQmTJ8CcSANKwYM1T2lc+v6h4zy+gZXpyBPo1pWSoraexO+rYva5CjI3A6x1Ep8rwwHZJGpttDMMCDDOz64vjpCNh9qOQ1dI4pSrpWa3pEGdhBT7KSQaLji0uK0WUzlXfxte1yLhuAoYEr7bIYjcwMgluQ6Ip9UjEJSN9dwzWrDHTEWLrC5BRPq+4grBVtTNt6XAYz/lNZLuqOMad9MPtQQztxUrPpzCiVLT8l9+dUgL+IWm+2PDQeDOZ+HblfN0GAC+8FFXjP9tRkdEDNZvfyyldf/QiPVYamvAogJGWaj6S7TWOx44oUYiZLESiJKPb3cLKip1hVrS4aidYh5Z5/F6jJ3hqrC2vwas+SX0nOwx0t3+TyBLttQ4gsA5LTgbJKVGkEMg4XSQxO5FJ9ArGMZlI9572j+T2jj4M4BLPxQg3RWDonAe2MKUmG3u1rFNgHdHYtiiqeTYaUReBgzgAiqOxWzb05RYr8tQeOKKGm8E84SWM2ioACyyBM4rjnqyCRDMVQK0EFfAyLd6KI7AthXhpLiEZn1oLjOiUdOYerNzjYRc2bkVSzkq9MjZ/eyBtCEqrXlNtfSqVeep02y9xbz3ALRXrQrHRE3e0ozjF1IBVeLWIpV/N7SUIfcWZSw== 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: Remove page_pool_defrag_page() and page_pool_return_page() as they have no more callers. Signed-off-by: Matthew Wilcox (Oracle) --- include/net/page_pool.h | 17 ++++++--------- net/core/page_pool.c | 47 ++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index 126c04315929..a9dae4b5f2f7 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -262,7 +262,7 @@ struct page_pool { u32 pages_state_hold_cnt; unsigned int frag_offset; - struct page *frag_page; + struct netmem *frag_nmem; long frag_users; #ifdef CONFIG_PAGE_POOL_STATS @@ -334,8 +334,8 @@ static inline struct page *page_pool_dev_alloc_pages(struct page_pool *pool) return page_pool_alloc_pages(pool, gfp); } -struct page *page_pool_alloc_frag(struct page_pool *pool, unsigned int *offset, - unsigned int size, gfp_t gfp); +struct netmem *page_pool_alloc_frag(struct page_pool *pool, + unsigned int *offset, unsigned int size, gfp_t gfp); static inline struct page *page_pool_dev_alloc_frag(struct page_pool *pool, unsigned int *offset, @@ -343,7 +343,7 @@ static inline struct page *page_pool_dev_alloc_frag(struct page_pool *pool, { gfp_t gfp = (GFP_ATOMIC | __GFP_NOWARN); - return page_pool_alloc_frag(pool, offset, size, gfp); + return netmem_page(page_pool_alloc_frag(pool, offset, size, gfp)); } /* get the stored dma direction. A driver might decide to treat this locally and @@ -399,9 +399,9 @@ void page_pool_put_defragged_netmem(struct page_pool *pool, struct netmem *nmem, unsigned int dma_sync_size, bool allow_direct); -static inline void page_pool_fragment_page(struct page *page, long nr) +static inline void page_pool_fragment_netmem(struct netmem *nmem, long nr) { - atomic_long_set(&page->pp_frag_count, nr); + atomic_long_set(&nmem->pp_frag_count, nr); } static inline long page_pool_defrag_netmem(struct netmem *nmem, long nr) @@ -425,11 +425,6 @@ static inline long page_pool_defrag_netmem(struct netmem *nmem, long nr) return ret; } -static inline long page_pool_defrag_page(struct page *page, long nr) -{ - return page_pool_defrag_netmem(page_netmem(page), nr); -} - static inline bool page_pool_is_last_frag(struct page_pool *pool, struct netmem *nmem) { diff --git a/net/core/page_pool.c b/net/core/page_pool.c index ddf9f2bb85f7..5624cdae1f4e 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -222,12 +222,6 @@ EXPORT_SYMBOL(page_pool_create); static void page_pool_return_netmem(struct page_pool *pool, struct netmem *nm); -static inline -void page_pool_return_page(struct page_pool *pool, struct page *page) -{ - page_pool_return_netmem(pool, page_netmem(page)); -} - noinline static struct netmem *page_pool_refill_alloc_cache(struct page_pool *pool) { @@ -665,10 +659,9 @@ void page_pool_put_page_bulk(struct page_pool *pool, void **data, } EXPORT_SYMBOL(page_pool_put_page_bulk); -static struct page *page_pool_drain_frag(struct page_pool *pool, - struct page *page) +static struct netmem *page_pool_drain_frag(struct page_pool *pool, + struct netmem *nmem) { - struct netmem *nmem = page_netmem(page); long drain_count = BIAS_MAX - pool->frag_users; /* Some user is still using the page frag */ @@ -679,7 +672,7 @@ static struct page *page_pool_drain_frag(struct page_pool *pool, if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) page_pool_dma_sync_for_device(pool, nmem, -1); - return page; + return nmem; } page_pool_return_netmem(pool, nmem); @@ -689,22 +682,22 @@ static struct page *page_pool_drain_frag(struct page_pool *pool, static void page_pool_free_frag(struct page_pool *pool) { long drain_count = BIAS_MAX - pool->frag_users; - struct page *page = pool->frag_page; + struct netmem *nmem = pool->frag_nmem; - pool->frag_page = NULL; + pool->frag_nmem = NULL; - if (!page || page_pool_defrag_page(page, drain_count)) + if (!nmem || page_pool_defrag_netmem(nmem, drain_count)) return; - page_pool_return_page(pool, page); + page_pool_return_netmem(pool, nmem); } -struct page *page_pool_alloc_frag(struct page_pool *pool, +struct netmem *page_pool_alloc_frag(struct page_pool *pool, unsigned int *offset, unsigned int size, gfp_t gfp) { unsigned int max_size = PAGE_SIZE << pool->p.order; - struct page *page = pool->frag_page; + struct netmem *nmem = pool->frag_nmem; if (WARN_ON(!(pool->p.flags & PP_FLAG_PAGE_FRAG) || size > max_size)) @@ -713,35 +706,35 @@ struct page *page_pool_alloc_frag(struct page_pool *pool, size = ALIGN(size, dma_get_cache_alignment()); *offset = pool->frag_offset; - if (page && *offset + size > max_size) { - page = page_pool_drain_frag(pool, page); - if (page) { + if (nmem && *offset + size > max_size) { + nmem = page_pool_drain_frag(pool, nmem); + if (nmem) { alloc_stat_inc(pool, fast); goto frag_reset; } } - if (!page) { - page = page_pool_alloc_pages(pool, gfp); - if (unlikely(!page)) { - pool->frag_page = NULL; + if (!nmem) { + nmem = page_pool_alloc_netmem(pool, gfp); + if (unlikely(!nmem)) { + pool->frag_nmem = NULL; return NULL; } - pool->frag_page = page; + pool->frag_nmem = nmem; frag_reset: pool->frag_users = 1; *offset = 0; pool->frag_offset = size; - page_pool_fragment_page(page, BIAS_MAX); - return page; + page_pool_fragment_netmem(nmem, BIAS_MAX); + return nmem; } pool->frag_users++; pool->frag_offset = *offset + size; alloc_stat_inc(pool, fast); - return page; + return nmem; } EXPORT_SYMBOL(page_pool_alloc_frag); -- 2.35.1