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 47333C54EBC for ; Wed, 11 Jan 2023 04:22:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 289738E0007; Tue, 10 Jan 2023 23:22:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B8C898E0003; Tue, 10 Jan 2023 23:22:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72111900007; Tue, 10 Jan 2023 23:22:14 -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 1CE508E0007 for ; Tue, 10 Jan 2023 23:22:14 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EF7C0C03DB for ; Wed, 11 Jan 2023 04:22:13 +0000 (UTC) X-FDA: 80341220946.21.6F8ED4E Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id 7C6B340009 for ; Wed, 11 Jan 2023 04:22:11 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TZSfhYSb; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673410931; 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=kcHD+D5Tm5hJWRmWu3rBaG/FQXhUTdD3u/FWIcAC/HM=; b=fDoncqb2Ooh69Ii0P+cy8WhWE6xBpZWoXsMjQO3sSFDY9aEqpTaVzvQNcqyiQ0+obD9E4W sZ8G7K5TIcErWDwqFaYk+pG+gbPptDiuncRG/bGqn+V3IamMqkKFE547O3IOOZiim/KQIz OuQY0z214COY4XM1/cXcmIe+keX9wog= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=TZSfhYSb; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673410931; a=rsa-sha256; cv=none; b=zJBxYBaVMFy1x0Eww0qwppbHHIQAAjgGqNJDnssEEcFtcqIKsfuYe4AY+nhL7XuYI2f6II RJS5/dQHEiK/PTXe6sXouTzVvoWt4lGndJmJQCmkO0NH9A1wVXlcxNMql2ZG54JH0eZj+c OYbSyun1zJjTZaIwfNvxdlnZRRr0Lnk= 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=kcHD+D5Tm5hJWRmWu3rBaG/FQXhUTdD3u/FWIcAC/HM=; b=TZSfhYSbRvNq1VJQ066og0F5pp X1lMd3WlHbOxeJFAiEO/trtpyRTh3ZGdB9Hgtjq3WB8/94sl2BycF5+iHE0TrJIXgn+9lLdB9JhVg Fp+viqi93tQr/z+LA97w4RjpVTd3kSsa2e1BEm6SRRHP8NlpFIK7CaD6znKzolsZ1oYneYU1ufM/b Jb7CoQ0TK6L4Xli+68eLdBW3MvcEta0mX/auV4z5IJ43LI7rCR6YjgZ69qqHATp7e+HTJ+fWcicLY rQDZqW6YH32oJu0DlVbYM7hudn6G/B3C8inqWF0lBORA4eF7/cvroaSkwf+OSzlAKUD+84TpUjNKO 3bf7XZlQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFScz-003nyW-IM; Wed, 11 Jan 2023 04:22:17 +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 , Jesse Brandeburg Subject: [PATCH v3 17/26] page_pool: Convert page_pool_return_skb_page() to use netmem Date: Wed, 11 Jan 2023 04:22:05 +0000 Message-Id: <20230111042214.907030-18-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111042214.907030-1-willy@infradead.org> References: <20230111042214.907030-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7C6B340009 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: goyg3gnwx77xd5cc7a8q1urmi1fhosot X-HE-Tag: 1673410931-180207 X-HE-Meta: U2FsdGVkX18PEUVnuzw8VsIliUMaV/DCOwOpSIv8q4zhiTfRU9a/JB31mWNq+y0JkYRYmhAiuw+7qsCmXS6CE3TBgop6TGhs5bL7Xd183OQwmnjW3jEwlhcH8NZH7I0vJgN6Iy4OZsqB9yXcV5FV7xPIgIv0Q1C+ZhuE4ZczJRbRnbkEQmHAu5O+ZCgWVOg6xclBEhRz+uO6R0OZX3qm4Y5Xmg/3yHAcWsZ1is99rs1dnptqoyBvY3DMdCeeQpvL20oCulEUWcdnj2Mg6vvIVkEU7oomU58Pj60cSR7vLsPZiNhCSuasmZEst3Nmm5khQbdgHjjeUt51KmDQsNwJMBf89VFDxsauTG5dTJaaWg/bGu7WqtVgNFz4SHxWFpWlRouP66puLL92RbTHsf5riaktR56hFlBIhdG1A76RkCDMied/ykKAUIORohiCZTg/qeqNbXCkoSNW55FGjJsEMJSCcq1Zilu5rNyTDCTyPcFLHFWIeQgKAAbBWnqwH/wq81sYi0k7Yy0vKr6D00EwkZom6ysWPpfcKh/YevA+YxJkM6VvaOSKwcg5XPz0fNEOATVB7O/0gXurWcIBmZTVz9ek5l536iIWchM7imQySTXEkK2/4qvigoNza+t4lTwCN2VeROn7s9ss6wRumJ1ARP128P3eDBL3+CRTGF2qvMURXtPMYXyCtZ7VZ2AR6u8Rg0/cOQ5QusT77rZFCHwqRyz7vL0noqGpv21/aT9Cibe1bftq28tfzjX9JU6GcxMiqLTzI7M4hbGDY3GYi+xw994OpdEU0Wjqm4amH6sYaAvrlx8c09A0d5Q1zqhmAss4LMK8nH7svvR/66S2jT+jnmva25icKTksk+Bcm1JhWbGQJj9UnteKknMn1+rC+83Yh2JvbtNl1SiSUVstSSEeXlVwE4bhbnAepR/ykYOhVPTNYiXD5J1aLQ== 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(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Jesse Brandeburg --- include/net/page_pool.h | 9 ++++++++- net/core/page_pool.c | 13 ++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/net/page_pool.h b/include/net/page_pool.h index a568d94043af..e205eaed21a5 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -468,10 +468,17 @@ 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); +} + +/* Compat, remove when all users gone */ 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 */ 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