From patchwork Wed Feb 5 14:40:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13961181 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 A17D0C02198 for ; Wed, 5 Feb 2025 14:41:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B59E6B009B; Wed, 5 Feb 2025 09:41:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 764426B009C; Wed, 5 Feb 2025 09:41:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5DE306B009D; Wed, 5 Feb 2025 09:41:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3AEDD6B009B for ; Wed, 5 Feb 2025 09:41:07 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D1584120DAB for ; Wed, 5 Feb 2025 14:41:06 +0000 (UTC) X-FDA: 83086153332.25.9661335 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id 20BBE80014 for ; Wed, 5 Feb 2025 14:41:04 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PFU1cub4; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf30.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738766465; a=rsa-sha256; cv=none; b=goysM5KDnL/hasu6JE39rtIcVkx3BBZuRSDlLYtUniPUDUZ/eiQOp3F6vR+9Dzozh1EnDe y79ZFJsAnEp2ktup/+wM82F35bXDyuWd4ntfwYOegFb6uH9pUyDoj+8VYHEb9jILcIQpQa gOLEzbpVX4yWCkS1CrTtphQSjwPLu+E= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PFU1cub4; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf30.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 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=1738766465; 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=12ko7sc0uNx7TL5zWA+a9qmI1uhVqCyaT+ACFapRx4s=; b=Fdp6n1PFG3RSMn6jE1/2zmPJUjRhrmIyZAGpnn6izc28Grqef3CnIYx7lJeIZQOwWAEB/3 5Pgh81wygzRuZpqLixVPUU0bezMpQ3JlutLKBz1Su0zERBuv1X/ZqorGnD6XN+PR62qJiT Ajpo1vIHlSrw9lkeePFs/YQ+OATLEKA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 770905C6AA9; Wed, 5 Feb 2025 14:40:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63F55C4CEE7; Wed, 5 Feb 2025 14:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738766464; bh=kMJok7jnjFYjv25BG0NXDx/P4+jGmqumTNiB5h/lh4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PFU1cub4gp7Q6tLcz4pr226x5t1Uynibb/l4rFTElf0xdejDMb4+N1qKztRUfLDna 0fCF+yg+FOEax1V+5R5SkoqukyQXtybN7tWdndBBroCh5pfH8ZnzmDz/7nmx50PWnm 54zyGbF/fiC3HXR07giJ6BHA9BJQmFc+A+ijTG2TbaKNR2R2y6F5kZXwO4evb5yTf3 dVsnBlE+zAkipTDXIV2Msdmo+g1BlqolgPV6KoU8ZE33dOSIWeNleLz11Smev+MbDl uIywtkIeU0WuSGyyoWWGQesAa6naYiF+P9EqHdQRW3XAtVGv9Gg2YrW7tL/0EuuFX1 DyHxYT0TJABcg== From: Leon Romanovsky To: Christoph Hellwig , Jason Gunthorpe , Robin Murphy Cc: Jens Axboe , Joerg Roedel , Will Deacon , Sagi Grimberg , 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 v7 03/17] iommu: generalize the batched sync after map interface Date: Wed, 5 Feb 2025 16:40:23 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 20BBE80014 X-Stat-Signature: 66xknuqch9orbuwpkd87euch5z1k9pa7 X-Rspam-User: X-HE-Tag: 1738766464-239365 X-HE-Meta: U2FsdGVkX1822yrnqDyH0ubgwK+Z7GiWN60FW/msxqPbOjR2egwnaKYZd7KpRqvYgLyECXTLNuXFNhy87Mn4SyDQf4glMzlTGkDTqkp25hQDiiEu6S8m8+iL2R0ouCqv4jYlm6WsxfBuxBzDB6c0cBBerm57b7ux4WsF3mqDZXatHQHP2vE0pRs365zsMzpVQdqH/AUr15/Ufyxf4T3d/MAitN35zwy0VU9kLwfyIoksgFF/bqWUWraqgY2NC76vAWusivBarB3pyF5XrCUeHH4yPEkP69FaBHkKrxIzV7TXjuOpxCxCZ9n1f+hDjLrI9/GdeN54V5Ix/TbHUok/yMkABfTigD181GaOy3UkCsy4ZskXwyAoqWRMSNfx+U5weLgRKIeKpmvNmXBBvc/a0aTFnygcE6dVqz5OUN5uDrfsx8SW/Dlh7BCWt4tWDEKo5qyMYPxQEBUJcbb171wMgwn5Svv1YBD1rPZpCdDMXM7yJpYddiYGZTPf5uC9KIEGuDe6HCRwgSvyevDFuD/PUoLtKOaPZS2ZpBg2nheIS+tn+a6GWNIfZ5SmQD+E1bQ3LVV8VkMSwN7mZMh+ZBlgmNCwTiP3fMX0rh8kjdhpHA2byqtChjmDAh+B2hEHf81lGOALu2G7lhJHlXeluhWN94ZFKplmOOxLGigHFXiB3xh4ocFwNCrLWe9B/diW0a5O5qkSiXz/9lpVQ+dyP11bI8U2m/Wv8RuSUYpc9SPHu5yShGhiKCoUI9qePkBS8tGN8d/pOC6e+owGSwZAjqhwbhg3AfJ/ppzwptIsvDxhn5oFWqjg8/yDozsVijVu/Xzq2B+yjiS1QifQpAnybSPnGBv24TEWNG8d9D1eWcMR00u1s/obgX/CleH/7bqTxyvjMRSqDoXFWy0LuWPYXzatql/DZbaQdKgUSqvhZFjmY18rRXTH8vNnyB5Z9tPtyRFjrJYKWdZG3WagbtLai3c Zo/fr5IQ Lw3P5FkPrIj0BdUvUslQaKGB3olILD3p+hZlmodve+vs/6ZEv6pfUq0TANY0AUcgO5V2k8hez1P/aDA5YLC/awg/hvvw6ET6kEV/JiGvwjd/mSyxF/ZoUYKUFjmhkFzSRunTHamYJXZb+d/U2lBBx+qhUhycSrX+AllVZlaL9neNC8cGYL2diMaDAjy6aw1Q35YE4L63qMOHrPiOSLlSx9TwGvQ== 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 870c3cdbd0f6..32b161988c4b 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 38c65e92ecd0..7ae9aa3a1894 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -857,6 +857,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,