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 CD357C3DA7A for ; Thu, 5 Jan 2023 21:46:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB8BA8E000A; Thu, 5 Jan 2023 16:46:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AC0EE8E0001; 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 67B158E0007; Thu, 5 Jan 2023 16:46:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 529038E0003 for ; Thu, 5 Jan 2023 16:46:34 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 25BDA1C565D for ; Thu, 5 Jan 2023 21:46:34 +0000 (UTC) X-FDA: 80322079908.10.2F623B1 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 1AB9910000E for ; Thu, 5 Jan 2023 21:46:30 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AZ1Y1AH+; spf=none (imf14.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=EeQYJMHII3fp3OKocboX4WAkN9RPKcuLop98P7fQXtk=; b=Il89F9VYq7FG2Hhldjr6f1axeCo5md0iLTqwXQUQqfzmJuBNNxtLLqBYRT1Z2gWVobKYf8 INFPIxNake3we5G90vMOOGfz19JCoFTUwnQ7fU8t+GzIICTB1dfxK6/RUmc9dTEBl5odyn UR1LCZ4tJuAVGq6gyErANmtp3TbJEUI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=AZ1Y1AH+; spf=none (imf14.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=24V8EQytEwaE6wCvTrrQneaSRRaLOAykCMUK1bUnHCzwna708VqvP8cB7mXJSNyKnDX2MV ODeSxpR25eoHepzQrADbq5w3z2M717mPyzx8KOAPjvtJ7kILldHDoE0Dff8J7nabU/hQWD pDrsWTJpp4+v/YcWdM50rOKGhkJSEUQ= 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=EeQYJMHII3fp3OKocboX4WAkN9RPKcuLop98P7fQXtk=; b=AZ1Y1AH+/uF+RM6PRqrmUXQoZc M/LZru31cC6BIHXqNZwO7eZ6SIgOirGp4tBiqTTCVW9LpBMEyi1jD/mCN0J2NvDkJGFY0gZYUd9Ep 9SRGENxcY01USdBXt1gp0sV0sSByQ6IGKsSWxF+mGU/FTFnRTww45hNq3IOBzI4UfHAVaNZDodTKq IdGnOcfx+8q37FpU4C0YPbg6Shd3hgacIC4xmkNSush4JxHf2jppdhn/Gil00V4EIGLmVu8qBmNTr fXJUVufSPWdp35WAOuEM8NlndUTHdwrtYmtgG6t3lvkBo/igKrOstwLXz/M4zEcSZ+Flj58mCNjwi Zt+j5CCw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDY4I-00GWnF-4u; 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 11/24] page_pool: Convert page_pool_empty_ring() to use netmem Date: Thu, 5 Jan 2023 21:46:18 +0000 Message-Id: <20230105214631.3939268-12-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: rspam05 X-Rspamd-Queue-Id: 1AB9910000E X-Stat-Signature: xijg4i63xgedngnfzye5xt8c9mwzurfh X-Rspam-User: X-HE-Tag: 1672955190-248859 X-HE-Meta: U2FsdGVkX1+T4avRV2eo0cUkUSWJ9Hf6YLU8bJGMmxCGwddiz9aQEA6NYkCZ8aZuc0S2PNHFbCXs7CqradYCZluez6QJ0nC6Onl3B/61b/ZNjyUt/ZPFmELTMG30uDFIZ6H9twxPLXHU02RYaKBgmTBxH1BVqFriKbgeLVaJly2ZJjFmlECaLBV4JazUDr1u0kk/fHBtZQso/XBlBYbz4yX+TeWvEbqq2xuylLeijiIto7Tsyudzo6i/3/Z8Mhepf4uSsG0hgYPYLWqgGNgp6gU95uZ/TD5FcLy8uHnTfoi5NSTtypZiGizHyJo3HT/s1dLcmTWXmjowCAK//7biKdbrZSrAVWk3o5vJxlMxayqubT+JlRnhRPtTJ34Bwh1yUYfrZ7guWxzT9EHJ5+/06S4nwPC/RQaWmroA6dC9C8PGYis0ygBZookPrd0fqkx1+RlrNozJ8qTDgdqblTUq3Rtd0mD4kaQxGjc86cpHsTRpRyxRl1DDuXy0cobYuaGfT8q148DUM9Y30V1wAlpJB+umLGq6FjzHWCBUUP5ThF+Uvty8K+bnHXxZLb5QTeim3f6M2xb/CXA5Xvdm05GUki/Hsx7fkyYp44hkZHvkaXbPf+lDVwB24BRrCR2YGMeZG8oXmTHWruHVAuaZcFCemzNo058KlW/cc/nIexjJ7m08YUafusz5GLahAximSXV5RE55zADqbmdfSf3+Obn5s6xm4+zNpksCSbKjJzsfZKQhDl0vkd35BTHs2CmNuMbAOl8CtHzUY8WOe7DjX8sV50HT+mEUAGiwHc1XpZhyRo2VSaFyOzrtu5Rbm1VdD8L7MED01uL+1WYHHAFXcVPPpd9hdBFfyEEPbmvdKvsk7p/THHnewF/rNv6aHyAiLmK8LO8Z0YloTauhgHSIOvPt0CIAnpy7iMP+hfNVBwlQHzuTm24RwSPodA== 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..0212244e07e7 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