From patchwork Thu Dec 5 13:21:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13895251 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 B0CAAE7716D for ; Thu, 5 Dec 2024 13:21:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C9746B0093; Thu, 5 Dec 2024 08:21:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1529F6B0095; Thu, 5 Dec 2024 08:21:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE75D6B0096; Thu, 5 Dec 2024 08:21:51 -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 C98106B0093 for ; Thu, 5 Dec 2024 08:21:51 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8138FAF710 for ; Thu, 5 Dec 2024 13:21:51 +0000 (UTC) X-FDA: 82860967560.26.257EF24 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf09.hostedemail.com (Postfix) with ESMTP id 3F89E140014 for ; Thu, 5 Dec 2024 13:21:39 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AhpE6pY8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733404895; a=rsa-sha256; cv=none; b=JMxGWDKKvrkf1SUX6/M52yvgAzKT5FiNkov/FyYWWtLSeOnNsnYCIfJJPrtKNfUffZIb4J 6a6dardqUNtUQsYReMjXIRnzJzPGd2MC8HBY9x8i0hOUMhi25GUYYM1V18hp7iYwKVFg/H jjPDEXbjguAQVc6rQbCm+snh5BUDhRw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=AhpE6pY8; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733404895; 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=tDiiYSE3uGopq55uae6HEzFj73Tf4VcEaXx69m08WE4=; b=75KwIGZMSqtFsy20daSaVfgKpGjK4kQxtUv9bFs0i35c/GjtoRU+WV4XIVc8tM8Hlsq+OJ BikmUG8Z86JXrLl/MbupotCwS31eXvxQIuaTjKYqN7K9M+lHWvJkyWbOexf+Kkfb8j5BXA 3r5qwlID2MuE88lRmxZgowGLDTfOQ6k= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 9A4C2A437DB; Thu, 5 Dec 2024 13:19:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84A5FC4CED1; Thu, 5 Dec 2024 13:21:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733404907; bh=/0RFbzCxs3bUpxWK8zAtOzrecMeBWxfg1712GxHC1Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AhpE6pY85SdNC+r4lks7EV776iLBqtiTug7Gh0bV8lVsy7JGPx9svjK+2ecD72KYn 39tMr3LlEh2v0nY5vF+4GGzMno2qYuSgYfk8mRjdDIPwi6vggvAZApPapo0LQTqB6a 2oI5DRaDSU8FcVq1SkgZS0c6BNiqW2tdk8EEzksj3NJDG3h858RevJ+egPytTGUOxX Ch1gioUynyPCZhgi0uyJiAO0RJjDKYgyA4RKqd/+3a/pd+EUz9TIo2fBJAeTlloSlZ MrqQ0sfvvMLbj8fJl4VdxZ/p9PfK7KMC0xZ/IAPpPct/6h8KlLOwjMD9zXXZRTDl+R AxpUxvt5GbmyQ== From: Leon Romanovsky To: Jens Axboe , Jason Gunthorpe , Robin Murphy , Joerg Roedel , Will Deacon , Christoph Hellwig , Sagi Grimberg Cc: Keith Busch , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Marek Szyprowski , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Andrew Morton , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Randy Dunlap Subject: [PATCH v4 03/18] iommu: generalize the batched sync after map interface Date: Thu, 5 Dec 2024 15:21:02 +0200 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3F89E140014 X-Stat-Signature: 3m7x18mkwyetrhqckxo5jdfot7x3pasn X-Rspam-User: X-HE-Tag: 1733404899-804412 X-HE-Meta: U2FsdGVkX1/nkFbC+KiYgVSTtkGVofAaBsHBZJBXNr2TYn/HXFs1Jr8iy49iFNCnZjppyxGF0h5qSAy3k9gc3VQr7tdSMNfRAUPMZeGUFGtZxYyF2L87/7SFnsB3V2T8cuiL2mVZhSBdZ9FYacc4auqR/X8kGeLGDadUunYnSoWCZjVDLI+VuJuClO1JONv3AcjJ9IyFxWgjvtp+8Bv+WuUELzkVmgnEM8np6KyuV496KQf05wHgZkH5TSphiWv9yR3a0hC01zUrvntnau4Kbhfq6djhhK81UtMBe3WSij98WYWHC+4tkHGMYip2FbIQnRYpj5dtp4ud3Fwj7vxJI7/vuOdNrrsxKpLhq2D+J6rzdU+k6b4jamFOHqQRPQbe8DGZPu2nONZKFwykw6DA7xVJsj4vR1+mSrR0/lQElkH0mhJ8Rkkb0Z43Uiz1GjsduDlMJRJ6hIM/X6Eeawmv439Z0KK216/3rfcNuZLnkj0kY0w4wc2ISS5aqFG/tvb8cXkAa/LNG7YD8gZDSk9f8kit2bawQ2gVVyi8+iAycPiymwKd5kVv5D5pu83FsKI/Oj3CWQPMzX1tLZ6DFjEjweTEBGcy34hDN8FreU177MlkiNe/v2zYuFiGmAvjMEgB4rAyhEgjju9JILl0pJxFCywqQ+fKZRXgTmAY265bxCam/sbMzGsAAAo20iOJhTf6N4ji0JXIdzDmaPNPewrbt+kZItvXhmUF4LzlPzUPoJvzpIEJZ+xEJdWLSEHHC4AsBF+7hEsuqah9ODDSBMusH3TIoxDvr8qx9Yt4QCR2COdpQjzqTe1ngvW+Kxidq39FjHdaKCDPXdQ7PW3VwQ5hem2H+Q2SNnwQ4VE1APBriVlu03gXDG1RSeOoBttuSLEtlMRo96ec7oeJUYdwTFudJlfosTTPmti1RG84+pkD7AKN0J3YZMzreEBaafL+5B/r0xgKZ8uTp3iY1NY1ofG WrDRpFbR e44neoZkQ1WpvbEqjTtFzcxJ8cchdmtWToHLXQ8xJQtC6cJK/X4FfJb/bIlW14yyEmPvrh9GGcIY2pN2AvJQR6IZ4o4AfjJd1lrDxFnNVKvSItiil7b7idmMPR5wTeGkmBOWSGzCIr6TFDPdfYOJuYts0h1Fin3miZK31OZYExqW0+SML4AfNhka8J0KnJy+yGhxd/YlV64fV2INTWIXuetUKZd5w1jaQDQan6GD+58TcIPYpnZr12/O4NdWDYsORLjnP 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: List-Subscribe: List-Unsubscribe: From: Christoph Hellwig For the upcoming IOVA-based DMA API we want to use the interface batch the sync after mapping multiple entries from dma-iommu without having a scatterlist. For that move more sanity checks from the callers into __iommu_map and make that function available outside of iommu.c as iommu_map_nosync. Add a wrapper for the map_sync as iommu_sync_map so that callers don't need to poke into the methods directly. Signed-off-by: Christoph Hellwig Acked-by: Will Deacon Signed-off-by: Leon Romanovsky --- drivers/iommu/iommu.c | 65 +++++++++++++++++++------------------------ include/linux/iommu.h | 4 +++ 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 9bc0c74cca3c..ec75d14497bf 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2412,8 +2412,8 @@ static size_t iommu_pgsize(struct iommu_domain *domain, unsigned long iova, return pgsize; } -static int __iommu_map(struct iommu_domain *domain, unsigned long iova, - phys_addr_t paddr, size_t size, int prot, gfp_t gfp) +int iommu_map_nosync(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot, gfp_t gfp) { const struct iommu_domain_ops *ops = domain->ops; unsigned long orig_iova = iova; @@ -2422,12 +2422,19 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t orig_paddr = paddr; int ret = 0; + might_sleep_if(gfpflags_allow_blocking(gfp)); + if (unlikely(!(domain->type & __IOMMU_DOMAIN_PAGING))) return -EINVAL; if (WARN_ON(!ops->map_pages || domain->pgsize_bitmap == 0UL)) return -ENODEV; + /* Discourage passing strange GFP flags */ + if (WARN_ON_ONCE(gfp & (__GFP_COMP | __GFP_DMA | __GFP_DMA32 | + __GFP_HIGHMEM))) + return -EINVAL; + /* find out the minimum page size supported */ min_pagesz = 1 << __ffs(domain->pgsize_bitmap); @@ -2475,31 +2482,27 @@ static int __iommu_map(struct iommu_domain *domain, unsigned long iova, return ret; } -int iommu_map(struct iommu_domain *domain, unsigned long iova, - phys_addr_t paddr, size_t size, int prot, gfp_t gfp) +int iommu_sync_map(struct iommu_domain *domain, unsigned long iova, size_t size) { const struct iommu_domain_ops *ops = domain->ops; - int ret; - - might_sleep_if(gfpflags_allow_blocking(gfp)); - /* Discourage passing strange GFP flags */ - if (WARN_ON_ONCE(gfp & (__GFP_COMP | __GFP_DMA | __GFP_DMA32 | - __GFP_HIGHMEM))) - return -EINVAL; + if (!ops->iotlb_sync_map) + return 0; + return ops->iotlb_sync_map(domain, iova, size); +} - ret = __iommu_map(domain, iova, paddr, size, prot, gfp); - if (ret == 0 && ops->iotlb_sync_map) { - ret = ops->iotlb_sync_map(domain, iova, size); - if (ret) - goto out_err; - } +int iommu_map(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot, gfp_t gfp) +{ + int ret; - return ret; + ret = iommu_map_nosync(domain, iova, paddr, size, prot, gfp); + if (ret) + return ret; -out_err: - /* undo mappings already done */ - iommu_unmap(domain, iova, size); + ret = iommu_sync_map(domain, iova, size); + if (ret) + iommu_unmap(domain, iova, size); return ret; } @@ -2599,26 +2602,17 @@ ssize_t iommu_map_sg(struct iommu_domain *domain, unsigned long iova, struct scatterlist *sg, unsigned int nents, int prot, gfp_t gfp) { - const struct iommu_domain_ops *ops = domain->ops; size_t len = 0, mapped = 0; phys_addr_t start; unsigned int i = 0; int ret; - might_sleep_if(gfpflags_allow_blocking(gfp)); - - /* Discourage passing strange GFP flags */ - if (WARN_ON_ONCE(gfp & (__GFP_COMP | __GFP_DMA | __GFP_DMA32 | - __GFP_HIGHMEM))) - return -EINVAL; - while (i <= nents) { phys_addr_t s_phys = sg_phys(sg); if (len && s_phys != start + len) { - ret = __iommu_map(domain, iova + mapped, start, + ret = iommu_map_nosync(domain, iova + mapped, start, len, prot, gfp); - if (ret) goto out_err; @@ -2641,11 +2635,10 @@ ssize_t iommu_map_sg(struct iommu_domain *domain, unsigned long iova, sg = sg_next(sg); } - if (ops->iotlb_sync_map) { - ret = ops->iotlb_sync_map(domain, iova, mapped); - if (ret) - goto out_err; - } + ret = iommu_sync_map(domain, iova, mapped); + if (ret) + goto out_err; + return mapped; out_err: diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 318d27841130..de77012f76d5 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -862,6 +862,10 @@ extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev); extern struct iommu_domain *iommu_get_dma_domain(struct device *dev); extern int iommu_map(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t size, int prot, gfp_t gfp); +int iommu_map_nosync(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, size_t size, int prot, gfp_t gfp); +int iommu_sync_map(struct iommu_domain *domain, unsigned long iova, + size_t size); extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size); extern size_t iommu_unmap_fast(struct iommu_domain *domain,