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 6DBD3C352A1 for ; Wed, 30 Nov 2022 22:08:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A0966B0088; Wed, 30 Nov 2022 17:08:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 829776B0089; Wed, 30 Nov 2022 17:08:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 654CC6B008A; Wed, 30 Nov 2022 17:08:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4AA666B0088 for ; Wed, 30 Nov 2022 17:08:10 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 25E084118B for ; Wed, 30 Nov 2022 22:08:10 +0000 (UTC) X-FDA: 80191497540.20.CA2BEB4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP id 3623640013 for ; Wed, 30 Nov 2022 22:08:08 +0000 (UTC) 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=iPBTKSyjdnWVcmy7PKTHSZ5HdtAW1lixRa2OtWrAiwc=; b=SrqZkHtngliktxapX4NhwLDBP1 lmINlxudkSZhEMAPNZHs3iXUPU0rQnF1U2Dr8ZpXS6G+kq/gt/g2fITgE3wFpvmwGW2YpdXe4Qcwy sE7XRrBrRXKXctHQLSMfFfPi6dgAEdoTlN8ateNrkz6MsjQdCwijWP/9SqZX6OfV4digTDPgfe5ep 2Ap8so56kxKJQuMQgBKHs0JvE8fshPbcWfniI+nlL33KokqAjqEQG9Hr5FSmV4UzJ9tSl1IGQh2dS K1oYNW+8ngA2Te96Ksijlf0F8Mn6KAmtgpu50rcgrar4Adh0dHlaDFaOXWJvY/ogC+FbwRHZp09oF y88mogbg==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0VFN-00FLVU-Gd; Wed, 30 Nov 2022 22:08:05 +0000 From: "Matthew Wilcox (Oracle)" To: Jesper Dangaard Brouer , Ilias Apalodimas Cc: "Matthew Wilcox (Oracle)" , netdev@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 11/24] page_pool: Convert page_pool_empty_ring() to use netmem Date: Wed, 30 Nov 2022 22:07:50 +0000 Message-Id: <20221130220803.3657490-12-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221130220803.3657490-1-willy@infradead.org> References: <20221130220803.3657490-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669846088; a=rsa-sha256; cv=none; b=zvNJFPdzK+Q9J/PCzoQ1A7j6sk3V86B43ll0iqhgw2AByS7sUB9pVAX93IqWBODbS7/Kly wT31GIOZB7sejUa9kJzyHXhsjXwY3sD/Gb9WdsC/LI0s1zWCmQcxa42Wo8Ob2mFdgga71V TdYKLbCj0ji+X5WkUB+NEXZYmUURJxs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SrqZkHtn; dmarc=none; spf=none (imf01.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=1669846088; 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=iPBTKSyjdnWVcmy7PKTHSZ5HdtAW1lixRa2OtWrAiwc=; b=6Z3by25iFAeiovax6qQjcO2vzRpOq6lk3yXCRyJpuHakKHBhGeIx/tlOaVFEYyoF94d0ix qex4uNtjy9DoDHqpbYwwsB8yTeOlGUt4x38o2s6MBByj+QSxpRukoLPyBTpKdWvcxhZ7jk v2GgDbBytDXlRzo8OOu7IgpcgMbaACs= X-Stat-Signature: 95fhdaawj911kzohwr18duqmhgoofy3k X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3623640013 Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=SrqZkHtn; dmarc=none; spf=none (imf01.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-HE-Tag: 1669846087-267459 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: Retrieve a netmem from the ptr_ring instead of a page. Signed-off-by: Matthew Wilcox (Oracle) --- net/core/page_pool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/page_pool.c b/net/core/page_pool.c index e727a74504c2..7a77e3220205 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -755,16 +755,16 @@ EXPORT_SYMBOL(page_pool_alloc_frag); static void page_pool_empty_ring(struct page_pool *pool) { - struct page *page; + struct netmem *nmem; /* Empty recycle ring */ - while ((page = ptr_ring_consume_bh(&pool->ring))) { + while ((nmem = ptr_ring_consume_bh(&pool->ring)) != NULL) { /* Verify the refcnt invariant of cached pages */ - if (!(page_ref_count(page) == 1)) + if (!(netmem_ref_count(nmem) == 1)) pr_crit("%s() page_pool refcnt %d violation\n", - __func__, page_ref_count(page)); + __func__, netmem_ref_count(nmem)); - page_pool_return_page(pool, page); + page_pool_return_netmem(pool, nmem); } } -- 2.35.1