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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 741F0C4167B for ; Wed, 29 Nov 2023 07:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:To:From:Date:References: In-Reply-To:Message-Id:MIME-Version:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=CqYfFvt1j8ktLMIZardcJ2d6omp/aytDV0J0KAgLWW0=; b=zUIyJ/Feiq2OxTQlE9ZLWOHENa araPCbblL4fBarioPsy34V67/2a3E8JqJk9jjvByotY1l4nfQlfTmfdLDba6R3JhEOjccS8xfx2MY 5GnAQcYvDYy9AqUyp1OsUjEKnvuDqXtiH9RCMYv6zURBWndiv4jnphdGn7+4xk+NiOhs249HWNSeB xhiPEpetfcDdMcfSqzIWmkbI4ypp9ilm50bkRRJRKclGIGjILlJrsHSVLTwsQVPjNrM767Dj1TMIt d6n8Qp8oFRByQsZZy9XzDANpW2l4ZOsc1jocQZozVayOwIOLuSx8PFq5mqfdXc9wzdO9dob4BwjDi 7rElvGAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8FKa-007Ocq-2V; Wed, 29 Nov 2023 07:50:00 +0000 Received: from new1-smtp.messagingengine.com ([66.111.4.221]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8FKW-007Oba-2g; Wed, 29 Nov 2023 07:49:58 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailnew.nyi.internal (Postfix) with ESMTP id 9064C580A2F; Wed, 29 Nov 2023 02:49:50 -0500 (EST) Received: from imap53 ([10.202.2.103]) by compute1.internal (MEProxy); Wed, 29 Nov 2023 02:49:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jannau.net; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1701244190; x=1701251390; bh=ww kE8lsdD1lmCvJ6vHeRL3ETi3+Yj2miubjiEiAIJqc=; b=WS0m9G0nx6dD9iEji/ fBqlaAFY/rMIvdHqXU7tZxzaCT6/WaZqN24lhBSrCWbph5RWVn8OG0wIE3vLDiA7 dOWPtjwm4K1LXbVSgViqbhQnGAqsI7zVo/p5C5Cc2lkcP6BvkMMbJJPRLlk6Obqn AHfiWue+I4lT9KO4M5IqOwcDkJ9k3rIoOQzzkgfdeVW+FPwIkWR8otEXHsC4vN5M YRFUR7qjaXjm+/zVf+gwWpzm9l6TfNicjYV48mg69Jf51d7lmUwmWy0QDMagwX+h my8WMJddQ84zOCl6wx49JlxbWBkrLfSX8dsYvVyefTTM6PDNHjgdqGvgdPI98pTh CeVQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1701244190; x=1701251390; bh=wwkE8lsdD1lmC vJ6vHeRL3ETi3+Yj2miubjiEiAIJqc=; b=rQPYt4rH1AA0LiTAAnJGE//YvqNCw 0qwLht7gsUZGiRgP8vOuUojrK3gXdkIqqQy8kh1RU6M48Z+Q1F0tnQhr+VVyl2w5 NmyzspDEFgY404mNlejNyplFYnmca/DQjbd3xvYN1Ln64vKHdITrMssLqBon8Ujn P7Qb4qPDUzh92GrFKk6+AzOXk04amTS8z6iqjc442y/87PjOdgE3r4Ts0YSlpbOW dquGLaB3VxWfcHpWrswAQY2/Rw9xn8Jq2WVIEzpZjj1/JtoUjjzbJm94BlKfxFeu aDZFAe2s9qDxCwDO/RDxvPYqUWrMro5Rq5vNlH5XTTV2LcBscKUpE50kw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudeigedguddutdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvufgtsehttdertderredtnecuhfhrohhmpedflfgr nhhnvgcuifhruhhnrghufdcuoehjsehjrghnnhgruhdrnhgvtheqnecuggftrfgrthhtvg hrnhepteeugeeltdelffetleetudejgfejieegudekleekleeifffffefgfefgfeeukeef necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhesjh grnhhnrghurdhnvght X-ME-Proxy: Feedback-ID: i47b949f6:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 5DF0E3640069; Wed, 29 Nov 2023 02:49:48 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-1234-gac66594aae-fm-20231122.001-gac66594a MIME-Version: 1.0 Message-Id: In-Reply-To: <20231128204938.1453583-5-pasha.tatashin@soleen.com> References: <20231128204938.1453583-1-pasha.tatashin@soleen.com> <20231128204938.1453583-5-pasha.tatashin@soleen.com> Date: Wed, 29 Nov 2023 08:49:18 +0100 From: "Janne Grunau" To: "Pasha Tatashin" , akpm@linux-foundation.org, alex.williamson@redhat.com, alim.akhtar@samsung.com, "Alyssa Rosenzweig" , asahi@lists.linux.dev, "Lu Baolu" , bhelgaas@google.com, cgroups@vger.kernel.org, corbet@lwn.net, david@redhat.com, "David Woodhouse" , hannes@cmpxchg.org, heiko@sntech.de, iommu@lists.linux.dev, jasowang@redhat.com, jernej.skrabec@gmail.com, jgg@ziepe.ca, jonathanh@nvidia.com, "Joerg Roedel" , "Kevin Tian" , krzysztof.kozlowski@linaro.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, LKML , linux-mm@kvack.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, lizefan.x@bytedance.com, "Hector Martin" , mhiramat@kernel.org, mst@redhat.com, m.szyprowski@samsung.com, netdev@vger.kernel.org, paulmck@kernel.org, rdunlap@infradead.org, "Robin Murphy" , samuel@sholland.org, suravee.suthikulpanit@amd.com, "Sven Peter" , thierry.reding@gmail.com, tj@kernel.org, tomas.mudrunka@gmail.com, vdumpa@nvidia.com, virtualization@lists.linux.dev, wens@csie.org, "Will Deacon" , yu-cheng.yu@intel.com Subject: Re: [PATCH 04/16] iommu/io-pgtable-dart: use page allocation function provided by iommu-pages.h X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231128_234956_960223_D2A58CF3 X-CRM114-Status: GOOD ( 19.38 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hej, On Tue, Nov 28, 2023, at 21:49, Pasha Tatashin wrote: > Convert iommu/io-pgtable-dart.c to use the new page allocation functions > provided in iommu-pages.h. > > Signed-off-by: Pasha Tatashin > --- > drivers/iommu/io-pgtable-dart.c | 37 +++++++++++++-------------------- > 1 file changed, 14 insertions(+), 23 deletions(-) > > diff --git a/drivers/iommu/io-pgtable-dart.c b/drivers/iommu/io-pgtable-dart.c > index 74b1ef2b96be..ad28031e1e93 100644 > --- a/drivers/iommu/io-pgtable-dart.c > +++ b/drivers/iommu/io-pgtable-dart.c > @@ -23,6 +23,7 @@ > #include > > #include > +#include "iommu-pages.h" > > #define DART1_MAX_ADDR_BITS 36 > > @@ -106,18 +107,12 @@ static phys_addr_t iopte_to_paddr(dart_iopte pte, > return paddr; > } > > -static void *__dart_alloc_pages(size_t size, gfp_t gfp, > - struct io_pgtable_cfg *cfg) > +static void *__dart_alloc_pages(size_t size, gfp_t gfp) > { > int order = get_order(size); > - struct page *p; > > VM_BUG_ON((gfp & __GFP_HIGHMEM)); > - p = alloc_pages(gfp | __GFP_ZERO, order); > - if (!p) > - return NULL; > - > - return page_address(p); > + return iommu_alloc_pages(gfp, order); > } > > static int dart_init_pte(struct dart_io_pgtable *data, > @@ -262,13 +257,13 @@ static int dart_map_pages(struct io_pgtable_ops > *ops, unsigned long iova, > > /* no L2 table present */ > if (!pte) { > - cptep = __dart_alloc_pages(tblsz, gfp, cfg); > + cptep = __dart_alloc_pages(tblsz, gfp); > if (!cptep) > return -ENOMEM; > > pte = dart_install_table(cptep, ptep, 0, data); > if (pte) > - free_pages((unsigned long)cptep, get_order(tblsz)); > + iommu_free_pages(cptep, get_order(tblsz)); > > /* L2 table is present (now) */ > pte = READ_ONCE(*ptep); > @@ -419,8 +414,7 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg > *cfg, void *cookie) > cfg->apple_dart_cfg.n_ttbrs = 1 << data->tbl_bits; > > for (i = 0; i < cfg->apple_dart_cfg.n_ttbrs; ++i) { > - data->pgd[i] = __dart_alloc_pages(DART_GRANULE(data), GFP_KERNEL, > - cfg); > + data->pgd[i] = __dart_alloc_pages(DART_GRANULE(data), GFP_KERNEL); > if (!data->pgd[i]) > goto out_free_data; > cfg->apple_dart_cfg.ttbr[i] = virt_to_phys(data->pgd[i]); > @@ -429,9 +423,10 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg > *cfg, void *cookie) > return &data->iop; > > out_free_data: > - while (--i >= 0) > - free_pages((unsigned long)data->pgd[i], > - get_order(DART_GRANULE(data))); > + while (--i >= 0) { > + iommu_free_pages(data->pgd[i], > + get_order(DART_GRANULE(data))); > + } > kfree(data); > return NULL; > } > @@ -439,6 +434,7 @@ apple_dart_alloc_pgtable(struct io_pgtable_cfg > *cfg, void *cookie) > static void apple_dart_free_pgtable(struct io_pgtable *iop) > { > struct dart_io_pgtable *data = io_pgtable_to_data(iop); > + int order = get_order(DART_GRANULE(data)); > dart_iopte *ptep, *end; > int i; > > @@ -449,15 +445,10 @@ static void apple_dart_free_pgtable(struct > io_pgtable *iop) > while (ptep != end) { > dart_iopte pte = *ptep++; > > - if (pte) { > - unsigned long page = > - (unsigned long)iopte_deref(pte, data); > - > - free_pages(page, get_order(DART_GRANULE(data))); > - } > + if (pte) > + iommu_free_pages(iopte_deref(pte, data), order); > } > - free_pages((unsigned long)data->pgd[i], > - get_order(DART_GRANULE(data))); > + iommu_free_pages(data->pgd[i], order); > } > > kfree(data); Reviewed-by: Janne Grunau Janne _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip