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 6BC17C54EBC for ; Tue, 10 Jan 2023 10:47:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBE8A8E0002; Tue, 10 Jan 2023 05:47:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B6D1E8E0001; Tue, 10 Jan 2023 05:47:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5D728E0002; Tue, 10 Jan 2023 05:47:30 -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 9979A8E0001 for ; Tue, 10 Jan 2023 05:47:30 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4859A1207EE for ; Tue, 10 Jan 2023 10:47:30 +0000 (UTC) X-FDA: 80338563060.02.70BC5C6 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by imf25.hostedemail.com (Postfix) with ESMTP id 905AAA0009 for ; Tue, 10 Jan 2023 10:47:28 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=D5yyUfbv; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf25.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.218.52 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673347648; 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=mroQYB+qcZhAc3ilXFdRxv656azL+aF3mo4oWme/p7Y=; b=QgYOUAyTPgAJXTBEtX8TEOwPDT1wlKKhcHSubAFZhLuSuc3Icmg4XV+GlsoR1I1Y/tI7Kh T1jMpPhJhbc/6o40SrfKjGES/VeDA2Op/VMmpeiYRdyJrd7L2D3nHO5RsDBSlIIUJYmiPM kXTAaNn350h+Dch5a2ydlcZh7B8+0rQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=D5yyUfbv; dmarc=pass (policy=none) header.from=linaro.org; spf=pass (imf25.hostedemail.com: domain of ilias.apalodimas@linaro.org designates 209.85.218.52 as permitted sender) smtp.mailfrom=ilias.apalodimas@linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673347648; a=rsa-sha256; cv=none; b=MDgmy43siD8uVaDLN4HJiS48EsTQyCavopdWXlpyNNWwF35HWVrSh3oRs+uL2cymIBTro3 KbG8XHfJYYG/GZs+thnY8LDUeae5sbaInhdHNJ7qyZ5ObwYLZisRYrzByOUB/FJyeHVke0 U8pTvO7iAWyO7SwkcO7i6RIcoGevHTk= Received: by mail-ej1-f52.google.com with SMTP id fy8so27401377ejc.13 for ; Tue, 10 Jan 2023 02:47:28 -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=mroQYB+qcZhAc3ilXFdRxv656azL+aF3mo4oWme/p7Y=; b=D5yyUfbvNqHYhHjNC/BFZvUGo9udqK8SgAeiUPd15DAySgLJk6Zo3A7AFhnU/MFQIC TUOcq+thlne2F7N09seduYA5JyTAGu0STf/5zxoFrW75bG4eX0zxch56dhev3W1Rhbiz J29iinoEd51JHGZ2XFDDStyrych1rz7wVLofadHpLR1NlvYni9132i+JuY2Xm2Q1V1BU t7tjeQqP3/W26Etv09GBzSexuCzG3tFnS/lZDmxOYYi6VdvEdofiHyLChiBB8GWtouOf Fw2JrAXHVATxNh/LqugW7ngbCIqcBP6fSDKswHx5DqNJpte6h+kdJ3H38frUQ+EsHdk0 PmLg== 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=mroQYB+qcZhAc3ilXFdRxv656azL+aF3mo4oWme/p7Y=; b=vSrlqncRrUrGneH7xmAVKEneYpsmXFt0DlxIrkKMCD5Q/s/BBA9l3pUgC/oucuXA3V T5sAK3l/IxbbnICDcOicK59LoQD4eJgZnBeF9vnmkg13rzIG1/VwBnGRk4iBXSTpZAj8 jLyA+6f3gMtRUwSjCUjew1FiXeOvTGXFemFIVOC0Ugcrv2y4cEUxgH4i4q4FyFJRYlI8 hAWqi6IIFEr4cfQ4/zyt2Lm9PqypsBRaF8aRfmqKDrjsMmkCovuotHBAFc6R/hZw7mPd 1CO/q2qJr1M4kds/hZF3aZ+Aw7VEIA+yMxv2q4AErYb0mYg5TJnZ3xbqg7GaYy+WDC7n vXDQ== X-Gm-Message-State: AFqh2kqT3dXmm2aTHbOetX95lFL3bdgedFeXyVdl1oDCnXOGO6iMEXNw WbcqWabWdOQKFHk9J1aykTolWQ== X-Google-Smtp-Source: AMrXdXuKJ3cNh2RxhOoknb5xSyX7IJXSwRaWnLnOFj9lekY5uPJ/qsBjra5oymc1mx+9pQAYqqQ8rA== X-Received: by 2002:a17:907:d38c:b0:83c:1a1e:1efe with SMTP id vh12-20020a170907d38c00b0083c1a1e1efemr57094303ejc.6.1673347647353; Tue, 10 Jan 2023 02:47:27 -0800 (PST) Received: from hera (ppp079167090036.access.hol.gr. [79.167.90.36]) by smtp.gmail.com with ESMTPSA id 15-20020a170906310f00b00738795e7d9bsm4704648ejx.2.2023.01.10.02.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 02:47:26 -0800 (PST) Date: Tue, 10 Jan 2023 12:47:24 +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 13/24] page_pool: Convert page_pool_dma_sync_for_device() to take a netmem Message-ID: References: <20230105214631.3939268-1-willy@infradead.org> <20230105214631.3939268-14-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230105214631.3939268-14-willy@infradead.org> X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 905AAA0009 X-Stat-Signature: q76iky6kmeh4jfieqzue8w43hp39etwe X-HE-Tag: 1673347648-236378 X-HE-Meta: U2FsdGVkX19ILsaPmN7KP3do3GSHO+BSxzNmOBwrddWk05jiqzyRbhtYFF4GcmuMJ+WMTszC+dlp6q/+mmBI9UnBSL+fC8NNBKgoiikzLQ2Hu1dc51prwW//8830YB66avGKi/MUOIJrpHhVENGzrFraXsR/YWTbkwwLw+1Qmz8zj02bIKhPOT3+a4j2KPyzBHwhWXcOeT3SgJsFweALdAfLzKRqcY1TQvojz08NoZ+nCaGeJF+lNA1GVEBZxg0GjS2RO44ud3p5F7gwhhMxy8H7GbEUgSktyes9JSS2KI9O9UbHdY5+F+4hM/pR9NwPv0E9w/l+hLXvv088KZQzL7DP6H8rJ3k2Y9wFN8i2t+0NhA2mvdjJDutK95o5tamubimAiLB7RCMzYhPgrWR4CAbL6uRGc04XDjGSGeyAk1UhndzTkFe+iz4IuEKsQiYfuTa/hnunyMnoduaibj5YjJHVcjRkjvNLDb9bTLRmhVkaWtbZGqdBb+FrP6sPICE91g3xEbQeacfTP4U8eOMH8ueU46VoBW82W+IQ9mQKOLsBjnknPBhfZMFjiveJjXv+9Zm8pwOqaXsyUw+KMmnYtrSIZ5hYLNBCg+L/9L6ayqrO+/aYgyGgolBuzYGf4UlJxEdlW6NDJRx/WlQJ/bgo1Ut/PhIYYpIVaCSPthtkopl97ua1gwF1XbrrygblPQLxwewdKeIMYNkcISiCOnK2wpVQG3rTFQWKO05+r8du92QHEMYKUsCrzPJtZe5CNASA0tOmwPDSN7oV+bNN9aXst/7vRIP1GYpltV/SPMHynQItCWePqU1Dn0gtDxXs/HX0bsda8X/IbUo1N7ASCQ9ar4ZJ7+vTNO1uzgJ4I+bjHqSBFJhd0bbwTMCBP6axSNqjaG99iGkel2j4A+xDElh/qhX5dAtfVR6RNiCVIu4NhiQTb47wR8w7uQwdDO91AAXyp1jP7r35Czf84ztiRp4 oN10F+iG OZSwQqi2Ys8uSAWSXf2YTKaNxD5I4dXdvK7C5ORTyoV3ucx44q/XbudwjRPdRZttcCnsFcqMC9mqZQMGnD0rUBjgtmG0TDBhCO9TE0xJm8CbE0v7wpq/5HMjkCL+nnEljwcrI 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:20PM +0000, Matthew Wilcox (Oracle) wrote: > Change all callers. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > net/core/page_pool.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/net/core/page_pool.c b/net/core/page_pool.c > index c7ea487acbaa..3fa03baa80ee 100644 > --- a/net/core/page_pool.c > +++ b/net/core/page_pool.c > @@ -299,10 +299,10 @@ static struct netmem *__page_pool_get_cached(struct page_pool *pool) > } > > static void page_pool_dma_sync_for_device(struct page_pool *pool, > - struct page *page, > + struct netmem *nmem, > unsigned int dma_sync_size) > { > - dma_addr_t dma_addr = page_pool_get_dma_addr(page); > + dma_addr_t dma_addr = netmem_get_dma_addr(nmem); > > dma_sync_size = min(dma_sync_size, pool->p.max_len); > dma_sync_single_range_for_device(pool->p.dev, dma_addr, > @@ -329,7 +329,7 @@ static bool page_pool_dma_map(struct page_pool *pool, struct netmem *nmem) > page_pool_set_dma_addr(page, dma); > > if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) > - page_pool_dma_sync_for_device(pool, page, pool->p.max_len); > + page_pool_dma_sync_for_device(pool, nmem, pool->p.max_len); > > return true; > } > @@ -576,7 +576,7 @@ __page_pool_put_netmem(struct page_pool *pool, struct netmem *nmem, > /* Read barrier done in netmem_ref_count / READ_ONCE */ > > if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) > - page_pool_dma_sync_for_device(pool, netmem_page(nmem), > + page_pool_dma_sync_for_device(pool, nmem, > dma_sync_size); > > if (allow_direct && in_serving_softirq() && > @@ -676,6 +676,7 @@ EXPORT_SYMBOL(page_pool_put_page_bulk); > static struct page *page_pool_drain_frag(struct page_pool *pool, > struct page *page) > { > + struct netmem *nmem = page_netmem(page); > long drain_count = BIAS_MAX - pool->frag_users; > > /* Some user is still using the page frag */ > @@ -684,7 +685,7 @@ static struct page *page_pool_drain_frag(struct page_pool *pool, > > if (page_ref_count(page) == 1 && !page_is_pfmemalloc(page)) { > if (pool->p.flags & PP_FLAG_DMA_SYNC_DEV) > - page_pool_dma_sync_for_device(pool, page, -1); > + page_pool_dma_sync_for_device(pool, nmem, -1); > > return page; > } > -- > 2.35.1 > Reviewed-by: Ilias Apalodimas