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 042B0C4708E for ; Thu, 5 Jan 2023 21:46:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2531C8E0003; Thu, 5 Jan 2023 16:46:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E91838E000D; Thu, 5 Jan 2023 16:46:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93A4D8E0009; Thu, 5 Jan 2023 16:46:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6D35B8E0003 for ; Thu, 5 Jan 2023 16:46:34 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 43A6740B89 for ; Thu, 5 Jan 2023 21:46:34 +0000 (UTC) X-FDA: 80322079908.13.1830D57 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP id 87426100007 for ; Thu, 5 Jan 2023 21:46:32 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=B0IMstPJ; spf=none (imf05.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=1672955192; a=rsa-sha256; cv=none; b=netelgWl4qWSTfd0rxAA3fBXwZrjSFChyOAojNmuNYW21d0Ys1nx+j0wo+OoXNrXjslZ+w pAjY/67KH8wi7MEOc2Pab1btvb+vpum+kCXeZcyJi+uxHEyDy9DjRR/S2Mchf44dmKbBiC wye4xdZKg1hA90gGNmyFkl/b+jzJbhM= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=B0IMstPJ; spf=none (imf05.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=1672955192; 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=lIvmCZwUtoaJt3sVXDitSXE8d8gXr+dU43z7S3YDxXs=; b=TvAT/UQzOk8j3fZ1qRq3FB/qhJRZMCoum+3jcLd3nWTGryi+50KYtTPPfVoVjF2yxy7I1i 1ubSDac/vuQP5SF5hTsgXn4L6/i/u+WKROka+n4YzUHUAgvbDJEq4OVomNBanTnUU/o8rH EVxmcs/B45FUtGKrBvx+7rnaLj3G76A= 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=lIvmCZwUtoaJt3sVXDitSXE8d8gXr+dU43z7S3YDxXs=; b=B0IMstPJlBu52FY/hGCEU+rl1I 1ap69no2R6a6XhkeNItIdR2rft9M2zgmBoE/u2YUEeJNSzZKFREAk8WkLrarDxNRepQ+3MNcVtZJ3 B5PFK3exUtbdWYd5nOXRi5e2YLaOdOi1DrxRPpMrySOs8F8dCX9nB1qsKWzOu4gwdiugDnWB5bqcd kCo0I8FQpubPkvZunuUjPvey4ILDed1IfpedFMxHAHRxulsdRFL8N/AEgtaqWGqnYSnmilhN3MT8V U+jCg3bWkGb2WRbaaPxM4p/48JCvhFId2Bl3K7TE46rQsDGid0bdvaAVLAyh9fEiLAUZjY6JSuVNO 1F5VBhjg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4I-00GWnz-Uf; 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 17/24] page_pool: Convert page_pool_return_skb_page() to use netmem Date: Thu, 5 Jan 2023 21:46:24 +0000 Message-Id: <20230105214631.3939268-18-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-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 87426100007 X-Stat-Signature: touedcq6u6donur6ienzp4ss5yoqod3e X-HE-Tag: 1672955192-846254 X-HE-Meta: U2FsdGVkX1/1qSo7xWteSeJ/+3SNLR8izX22YcUCtgE1rj348ChgxLf5e8StegY47USpGIqpRz3n+00SLqjhI2sOI3eQh60JXqYJlrJUXHcxlD0Yf+L6Wy+EYUQnoNEaWZO5OcGMyj8q0MioIj9mhYCfytJ4Y7UM7Q40LfQj8QPdheWpNgSP+tOXJNd171yH6rwB+XBAsXlyCiTD7egwWOP6tqDP391fLcbTJIP87X3Z+BQaqkk6VuGgibpxPILQdMa7xD3tDQI/AcblsUgrsMevpDU+E3jS5xOhSvQByyXhGcx4PDlu4KIMCXlTccwBr9NsHj3b4msGUZtxudx9x28JCvsYHlAL/DgpUnxORhvqd3TZ7cIGrOC8T3JZjQFNlfhQSW0Yjjrg2eSAE9Wlvzk8oZJ22oh4Xr9YP18wWAxo4Nl3QF5pRBrsWSJD+2tm02NA5W3z9nd0cfSiazDF7N8gKYZzYyzqJspFZCrRQvB6tHl9FiQ2rjQDjnHvTbg0G6vS/WSS6LzTTAsafPqxyr3uq8Gb0QLSD5yP1sl8wxSv9T6Rr5xzPgHiLn1eWYLKHDs/WwVnDPkee8zGJq772Xkdm6uxKKPi/wnCENfh+CHNrvvEcThNSX4sYJU+KoD6JI6ojBpSX2MF50vskbMV9c6a9hzNNAyHobr8MWhOBSImTDeOa3bN45Btar/FotVZENfJsnV+xZi40Uvb60MSDDYbAUSYQWUlCp6FGFpPrikoFOdAWggF7LXK/hSUI3Mw1kmMM1zlHu433TOEmoDf+BAKL1FItTXxw1fqD4nyfJFdKLW0eV0Nkl72sHiDDkzA2g5TRFzB134r1DXkNBUmo3YYq/jAbAuTZ597hrAxQajQX/0wNmTkxoTlfq239d4cxm+p1vKAtXw8EJU+gmq6EMEqqUUuS0gEWOqxWAIcl78OqdwJJZNKlQ== 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: This function accesses the pagepool members of struct page directly, so it needs to become netmem. Add page_pool_put_full_netmem() and page_pool_recycle_netmem(). Signed-off-by: Matthew Wilcox (Oracle) --- include/net/page_pool.h | 14 +++++++++++++- net/core/page_pool.c | 13 ++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index fbb653c9f1da..126c04315929 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -464,10 +464,16 @@ static inline void page_pool_put_page(struct page_pool *pool, } /* Same as above but will try to sync the entire area pool->max_len */ +static inline void page_pool_put_full_netmem(struct page_pool *pool, + struct netmem *nmem, bool allow_direct) +{ + page_pool_put_netmem(pool, nmem, -1, allow_direct); +} + static inline void page_pool_put_full_page(struct page_pool *pool, struct page *page, bool allow_direct) { - page_pool_put_page(pool, page, -1, allow_direct); + page_pool_put_full_netmem(pool, page_netmem(page), allow_direct); } /* Same as above but the caller must guarantee safe context. e.g NAPI */ @@ -477,6 +483,12 @@ static inline void page_pool_recycle_direct(struct page_pool *pool, page_pool_put_full_page(pool, page, true); } +static inline void page_pool_recycle_netmem(struct page_pool *pool, + struct netmem *nmem) +{ + page_pool_put_full_netmem(pool, nmem, true); +} + #define PAGE_POOL_DMA_USE_PP_FRAG_COUNT \ (sizeof(dma_addr_t) > sizeof(unsigned long)) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index cd469a9970e7..ddf9f2bb85f7 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -886,28 +886,27 @@ EXPORT_SYMBOL(page_pool_update_nid); bool page_pool_return_skb_page(struct page *page) { + struct netmem *nmem = page_netmem(compound_head(page)); struct page_pool *pp; - page = compound_head(page); - - /* page->pp_magic is OR'ed with PP_SIGNATURE after the allocation + /* nmem->pp_magic is OR'ed with PP_SIGNATURE after the allocation * in order to preserve any existing bits, such as bit 0 for the * head page of compound page and bit 1 for pfmemalloc page, so * mask those bits for freeing side when doing below checking, - * and page_is_pfmemalloc() is checked in __page_pool_put_page() + * and netmem_is_pfmemalloc() is checked in __page_pool_put_netmem() * to avoid recycling the pfmemalloc page. */ - if (unlikely((page->pp_magic & ~0x3UL) != PP_SIGNATURE)) + if (unlikely((nmem->pp_magic & ~0x3UL) != PP_SIGNATURE)) return false; - pp = page->pp; + pp = nmem->pp; /* Driver set this to memory recycling info. Reset it on recycle. * This will *not* work for NIC using a split-page memory model. * The page will be returned to the pool here regardless of the * 'flipped' fragment being in use or not. */ - page_pool_put_full_page(pp, page, false); + page_pool_put_full_netmem(pp, nmem, false); return true; } -- 2.35.1