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 11341C46467 for ; Tue, 10 Jan 2023 10:38:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 646008E0002; Tue, 10 Jan 2023 05:38:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F5ED8E0001; Tue, 10 Jan 2023 05:38:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E5208E0002; Tue, 10 Jan 2023 05:38:12 -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 3F9A98E0001 for ; Tue, 10 Jan 2023 05:38:12 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 19C578038A for ; Tue, 10 Jan 2023 10:38:12 +0000 (UTC) X-FDA: 80338539624.13.FCD80E0 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by imf30.hostedemail.com (Postfix) with ESMTP id 71DC480010 for ; Tue, 10 Jan 2023 10:38:10 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=Ozcy5qrV; spf=pass (imf30.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.218.49 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673347090; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jxCk+INuJb5IJ/Jm7iY7t6eqb9Zqw0Ms0o9owTWQx6c=; b=EAnvdTzSbS2d9VrCH671TofEZfwu0cIoCULhSqXkvW1WJnl1UsLFi9OANHg7cQVsADxqKm pGsA8orm+EUmtDjnZ99D/JoKH0VmwYF0gHVdEQvB4CoIkYkWSTp8Ixu49H2PvawnN7HZ23 Qcaw/S7myptM7rmknak0+WBS6p7jh90= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=Ozcy5qrV; spf=pass (imf30.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.218.49 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673347090; a=rsa-sha256; cv=none; b=nhr5spwKMhqNAy65nsj893hyUJD02EKisuqhSojWFbBb0v1G2FJuh3xPwJy40HpXmZkH7S iFCA1hPT9yWvVa4PhiQPFh1q5WytEz4PeCUmuaNJIr/toWSi0GDTBGrKLFsflYRBaxtJPb JJeXlr9aPUAKp0CIxjFe8zoHu/xLJtI= Received: by mail-ej1-f49.google.com with SMTP id u9so27497285ejo.0 for ; Tue, 10 Jan 2023 02:38:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=jxCk+INuJb5IJ/Jm7iY7t6eqb9Zqw0Ms0o9owTWQx6c=; b=Ozcy5qrVAdybUnBO/t4N5enJX/gO+c+PJm50JjhTZ8P+9dvH3I0k3iF6I3sHneLZK3 xmNfWdnuMAzXZiW1h9pHrcnIziWmhywED1TBzGkQb8hxwZLc6EGkqcMLFzouc9pXg57d DK5SWFs/kMjxsSYLOBDk6rzWzlgVsJcjKa4NDXbqMJqRDTvgpLZICk0Nbd5xBmnz95e4 kUfFfLQ+YU8m3KfSvilDDlrEw2sE66am1jI1i+Z9whsL//3JvJWmr2vu7K75YKz9JNiv vRbzUradoZP7TmIBofl9IfZv+RqCv9lvE+EQrfolw2KWItvTZqHfLNtj7mXYe4MEhx1J jrgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jxCk+INuJb5IJ/Jm7iY7t6eqb9Zqw0Ms0o9owTWQx6c=; b=cy3885qvQw8XzU/dTGJsn0pzDo0Ae+xB0ANHhouY/DfNZrUTe6LhiGi4hLaX85RSPQ qhcxN8d9uAut4SKPfG84EvB9Nw2mXi5FSl/2rz1WxHRsnsNL0OK1eL0POQKgaymhNSTH NVtmvfiLOkIFvSWFipSdZ3KtmSeXr5r8ocynXE1avxXdFaUH5aFVZ6wYhRDHGtSxjI4d 4kc/trqRBt+FJbSBXC0fETubHdiWzfcyfVt8CoyolJOI8xPle6ZjDH6tsB6BUUddeQ3q KGynOFwks5ksr2aMtN7TkaV2jZSeXYq/0awF4EZ8LbsVfPV6dpqaZJPjvLNVzTikztqw WvjA== X-Gm-Message-State: AFqh2kpd9Xr8o0nEAwdr4zODStV7nCMYDwH1ELIy778kdQJoPEZVBHq1 rQpMi0hJwaHWYIRFUsdtAPjXUA== X-Google-Smtp-Source: AMrXdXsgCobzUc3EKdZGLCr2B4sXcO22He4oOjTtG7Gu7aYFQ91amylkt6owbhhqhVXzpT24Gl/mTg== X-Received: by 2002:a17:907:d68b:b0:7c1:691a:6d2c with SMTP id wf11-20020a170907d68b00b007c1691a6d2cmr78467457ejc.7.1673347089210; Tue, 10 Jan 2023 02:38:09 -0800 (PST) Received: from hera (ppp079167090036.access.hol.gr. [79.167.90.36]) by smtp.gmail.com with ESMTPSA id f1-20020a17090631c100b007aea1dc1840sm4781510ejf.111.2023.01.10.02.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 02:38:08 -0800 (PST) Date: Tue, 10 Jan 2023 12:38:06 +0200 From: Ilias Apalodimas To: "Matthew Wilcox (Oracle)" Cc: Jesper Dangaard Brouer , netdev@vger.kernel.org, linux-mm@kvack.org, Shakeel Butt Subject: Re: [PATCH v2 11/24] page_pool: Convert page_pool_empty_ring() to use netmem Message-ID: References: <20230105214631.3939268-1-willy@infradead.org> <20230105214631.3939268-12-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230105214631.3939268-12-willy@infradead.org> X-Rspamd-Queue-Id: 71DC480010 X-Stat-Signature: hikh5xhj7knzszp96x5w3ce6yj7zofjs X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1673347090-236859 X-HE-Meta: U2FsdGVkX1/L19WgUQyKxlq8/yJeKOUadMWWuRf5UwZNn20V7MKTFrQRGkzlLQErZrFSX8xEtiPeFqTOodrcAeHJ3C31I6cOghBWRymMB4zi3fzsI+gzAGlcrUlsqkGiFttAVwVm2nYBsAgjqW+3mI7YfEZk3Gn9oShmZzY9/jkEMPJJynfTI/uocSusrPSA2+yIkkiFmabpvbdU+CC8n1XYN9wUVX4/qTahe+jKv4QyfjSq/nc+WNQ6aC2Q1N9QbbPSh7yVMcVT0b7WL6cn3pJ4029wUB4izQ4yQjTElOhNCzeqLrGyb7PxLWTIprV9xCFrqK8f48fgW/d9vxqWs0UOTdFzOzGLehgcAnyDDqjcjJiD71Jrv79BnlEI8pre/NBPqy7b0/ZaYbYE4CDDXWCEnbQwBXt8Z8hpijiaDEOhwzhCrIzc5E4AZuluVn8DN6gTvU32K5p/wcV7ZY2aellmgvrYHM2I7bUXlsD8pj5V+Ne4ii+p77hlKo6zs2EccAjiJjbU5n0LxhBhS6crtbi1MAfbTC7klMYfgPszjOFwxqKWxUZDH+27OuBaBHPI5W0bdJ1yrjbAq3W13+fY42BQyvkphTc7v+Gn3zmxobYiRMMRFI8olIxlNN6/W6co5QE7p37Z2z/Gy8RnOYei0GWzwwIlqgO5KvoEG39wGQFhIH2gk0KLHFZP9axkSP6Jw/rJ6zM+MmV8669sljWq/go2n7kH2ZJpldLGEhyCWU4/zD3LjGAcmX3bo5O87DNN8CtuOKCF1LRtxmqRUif9I0TYEFXFRzuvahnm+Mn0jQ8cPEnsLTmkgQGCQ7OqtcPXHhCDWOfmSmbGppAw6o9X9MXBBtTERSma0XKjbACF/K0q2fkVikIbrnLqfEBJuHB1TIiJnGwNRIvZ8gU4rQ2qjhF5b2b75atiQel/thPmg+ZKPd3SX7TGoQzoM45M4zpLC0E/yi6KU9S1r0j3sST aKwEQObg uEOwijpSKZxdx3KhPNW2WGauo8HZf1/wY/FrpNDRCYXS6YmhwTY9JVp9TurYIiEG7DBkmyw5d2Q+PVf+vDA6+mRvA4ztqXO88P9D2QvSgJGbGL+CvPWa8p2tDqxknY06zFiom 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: On Thu, Jan 05, 2023 at 09:46:18PM +0000, Matthew Wilcox (Oracle) wrote: > 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 > Reviewed-by: Ilias Apalodimas