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 E5C79C54EBF for ; Thu, 5 Jan 2023 21:46:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19CF290000A; Thu, 5 Jan 2023 16:46:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 105F690000B; Thu, 5 Jan 2023 16:46:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E1EB190000A; Thu, 5 Jan 2023 16:46:37 -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 B3783900009 for ; Thu, 5 Jan 2023 16:46:37 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9605FA0C1B for ; Thu, 5 Jan 2023 21:46:37 +0000 (UTC) X-FDA: 80322080034.15.64C1D67 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id 02E874000A for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="OK6S/uxI"; spf=none (imf11.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=1672955196; 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=H0WxbnPFe1KwSIjWT4wmoPQAd35t/aj4S8nLWveXfxg=; b=1/h5fltzfFXlZp91gYou63zmq3tERwSLRFvo4neogjeFkBt0ac+VM6fZzPvA92beN8exfF On6C/vlSDp8F8EPMpMWrBY0cBzRvv45m+SSJ+OJa1tc+ByISk6EvHdgBOI1X0i9wcDf7em E+MTt25QD/a/W23Uy5LhGR1JvuMVLjY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="OK6S/uxI"; spf=none (imf11.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=1672955196; a=rsa-sha256; cv=none; b=QW++/F31CnPC+NGf25MJ01lTFB3SFZJea1ajfYGRV8NYCj2D4WAC/pQfigMVKCDaVfzFOO oFX3VME5a2nKAcEFFiSNaq8QZThelTbLJi+qf5P3CRaNSjiwa3mPRuxiwbLACI3eGUZjjj wMQdXqqnv539qp9AV09HK8bK3N2SNjU= 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=H0WxbnPFe1KwSIjWT4wmoPQAd35t/aj4S8nLWveXfxg=; b=OK6S/uxIVk+67IWWhtmPrP3Q2Z WyvKA4Bp/2LYMKs1FgePJYKdVwXc7MsaG2jV52fI4uQFIZd/s4+Vorl1DgyWTf/B8Keq3Km2Ys/Oj snwvtgYaWZME5DwCGucVWI9hgKqSKmnrD4PeGm0UYQ58jxMF9qCw5PtlPTopEWoUqVk7LFLl0NwCr U77/CCd+eJ3vwfW7uoEs4BzhQJIBSInd1EGihYp0d/GOjsbL9TBcufAfBmbPPOMHrmWiC7jSGJ1+O OnoQaRy42+GwDfjrXkyoT4aT4kyVd8NfZ2DYCtc2scUId6QD4f3deEgxRMIsvVfB343ZPmkcQ7Zvc VPXTdU1g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4I-00GWnh-IT; Thu, 05 Jan 2023 21:46:34 +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 14/24] page_pool: Convert page_pool_recycle_in_cache() to netmem Date: Thu, 5 Jan 2023 21:46:21 +0000 Message-Id: <20230105214631.3939268-15-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: 02E874000A X-Rspam-User: X-Stat-Signature: edp1qjcacfh5kq55ccjngbbtbwigwoqs X-HE-Tag: 1672955195-687020 X-HE-Meta: U2FsdGVkX1/EGnKpjsvErxOp1Ove6KDj8sENokMWJnGdiU2cDSCSt708DEBGvSfy7FtPfXOCnKrLJ72spa3sTumcTf7k9sCHAneozfDYPM5RiUHML6KhjUYcYdhJCE6VsoNv8cgMc41SfNkL0dQymlB62kAcdaYaugb9kSidI3FMKTb8O8hHi0kA6ZUQEmIfV6MUDJEsnR4XGfsamT8vBuWSLtwRhXcMrkTjJXQJ4i6Cw1GMHR98pqY0n4gTe2/eejMi4ELJ2HAPC3zwh7WVA1WOIQMWQ/4DT42W+nz3aFasrnI1WeXCFDGs2kzEYB4+tYH68XH2iqvg/DWte1lKjhxa4NGHPaIFSY33SRlbU77+6f5nyczUL/s171wxxpQtRAMiIqZ2oyNSZVmSH81QMHTB7HpLvD+7A+sfG9+InZy4ZBaIfiPgMioTsESoQehuu7rvzSHQjaVOIRTmmQxfNyNOdPQBhwopuiTFvCksUiUSPk2DkpP75GnKwzQUvIAPVNcQMpJfTBQN4FZMUaOqkG1TLgAtRdLFA6KoARQmZ3wtT2FxKMZwhxjAavCl+DmjzXczo3dA0MxfY5yn4ZBbCddUGZ5xlJPZcy05jie83rqa5FdlTPXKLFLY6TmIVmHZm1f1KJ/TuySvwj1I5ohMgD1UvNepChNdA/nssY0SoFp6FoIIlAYn/BHGo8zqLFvgppNBuKUv0A72cG4VPY4JTokE7gPWqFfF2RjwWJlajSAQLS5PQI+ykjIIKlluemiuXZ3D19cB0SRNPqQiXWuzHuPbu0ZDvhW1mPhBDEuJ/3sMOCEI/gojosX5iXG0GFWjESsATg7pIgJEAbYcwpsIZQoNUXyZ7dnwSiYi+5bqEuPbFGTAUR5dQBZqzcD/lnCdphmG2M9Zn4ulP/YkMGlXaVcM0Daa5Vzvlx+5Azn5gGgxCNQoGwfBsA== 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 a few casts. Signed-off-by: Matthew Wilcox (Oracle) --- net/core/page_pool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 3fa03baa80ee..b925a4dcb09b 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -538,7 +538,7 @@ static bool page_pool_recycle_in_ring(struct page_pool *pool, * * Caller must provide appropriate safe context. */ -static bool page_pool_recycle_in_cache(struct page *page, +static bool page_pool_recycle_in_cache(struct netmem *nmem, struct page_pool *pool) { if (unlikely(pool->alloc.count == PP_ALLOC_CACHE_SIZE)) { @@ -547,7 +547,7 @@ static bool page_pool_recycle_in_cache(struct page *page, } /* Caller MUST have verified/know (page_ref_count(page) == 1) */ - pool->alloc.cache[pool->alloc.count++] = page_netmem(page); + pool->alloc.cache[pool->alloc.count++] = nmem; recycle_stat_inc(pool, cached); return true; } @@ -580,7 +580,7 @@ __page_pool_put_netmem(struct page_pool *pool, struct netmem *nmem, dma_sync_size); if (allow_direct && in_serving_softirq() && - page_pool_recycle_in_cache(netmem_page(nmem), pool)) + page_pool_recycle_in_cache(nmem, pool)) return NULL; /* Page found as candidate for recycling */ -- 2.35.1