From patchwork Wed Oct 30 15:12:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13856682 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 4AF35D5CCB3 for ; Wed, 30 Oct 2024 15:13:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCCCF8E0006; Wed, 30 Oct 2024 11:13:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7F8B8E0001; Wed, 30 Oct 2024 11:13:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF2F98E0006; Wed, 30 Oct 2024 11:13:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 916638E0001 for ; Wed, 30 Oct 2024 11:13:53 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 38E261A0B29 for ; Wed, 30 Oct 2024 15:13:53 +0000 (UTC) X-FDA: 82730612748.30.94A90BC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 7C1722002A for ; Wed, 30 Oct 2024 15:13:39 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dUjbzlfB; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf03.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=1730301055; 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=v5SYRMY/doGJo/E57q9NuO+kOt01Crkg32kQAVBzJCY=; b=zcshUttlGEHNT6WBmFxf/HhW3LCxbZKzwTktkhzemmoyP7Z4KijIdU77kJVskUK6dGhenG 5MEyGqvPKZFV05k/qGYJrgm/mm+O9iYRdMRTh4yL2nMnIi/QFThHcCune6i9Ryk14nX8mM c9dvLis0yngCzsA58tmPGFDITiDRihE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730301055; a=rsa-sha256; cv=none; b=e+MMXIfU0iagn68dFNvcU9NfoGoQHQNPkDlCZHjhh4L3YdSfhPMcbzEKIpGoNbn4bE/KEu E0zGLx/kqBpUTOenbe1v4llPxksrcvJvwpPmAFJSa0Y1yuQOR1fEv5ZbNsoU327R1KtcP8 +VwK7xGRDFjH5L49T2EKbevEbfu/hCE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=dUjbzlfB; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B70355C5E7F; Wed, 30 Oct 2024 15:13:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 864EFC4CECF; Wed, 30 Oct 2024 15:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730301230; bh=RhcK3jpx80P74UKqRSLHZKtWTOJGp14TVgQFOHpK5uo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUjbzlfB58nam+e/KuKFD86cA5mG8ygjLY9xQ0Z+h8sT3ni+00nHbhRibOA92d2hi 8xSFaFNOhS1hi7n1y1TP/+mgcST+mtaxk4HgBka7GNtvh7Mt9RzEEVIg91E8eZ4pX2 A/wD3SvwthfhxnGgkwocL11q550gsMwYXoTxqLkRkR/bcMUsXgtpEBnrlQ5MuVmOam 3KHo6w/cSCf3BLB2YJgJUjec/9ITBowgjGgsaPk5GvKbINh9JofcCiGOH7ZipyG9gL ZdHwhS8PLH6oDNV6SpMo+XFB1UPff4GK4X5kD5OYHis9J0N5UQL1Uyin1m7/ZYvKdf yHA0I8oajcNSg== 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 Subject: [PATCH v1 03/17] iommu: generalize the batched sync after map interface Date: Wed, 30 Oct 2024 17:12:49 +0200 Message-ID: <589adb3a4b53121942e9a39051ae49a27f7a074c.1730298502.git.leon@kernel.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7C1722002A X-Stat-Signature: 7tux54t6rxqb4q3ktbidhgokb54t86hn X-Rspam-User: X-HE-Tag: 1730301219-826407 X-HE-Meta: U2FsdGVkX1+LXsxql6MFLmtTWFG6QzIX9KAPYVmkwZ45c8Pu8pa+q8bEcOGWHX5QJM7+qpz53B4/GSkqbPs/ede8fejgPnrDt7pDedfdEIluxgwybTscVr2V17WWfLx1Rieu9qGhBxBg17S6HMSuKCC3i6yPDNLm5LG3v0MuBbU1T+8uVK6YK2er3NQ2pYcIfiTV2qWCEblM6ELj/YjVVrOUntnXg7GCs+x9Htx088zjI20koi7ide8r/A1+5H2ozTd373GdF3giKxjR4j9GKCCLS8gXxGthu54kRLNIAZxezQOQw8UvBM/EYt/3RASLCYqwBbGg46xaWg7rRD4MV+eY4N85ob+Rx5MvOV+88jHv1v9Fc2Bf6Up95an5MVAk0F3YhQNWUQ8egka8IWkD4tgbjsJZKhneB0aDM7PBZFTZ2rfw1DyXe4rvnSDoHqjaLDWeex+FBT1N+WUM62Dp8vHDznXwzFF4ui1QmWL5shRNx8jYKeXsk+PC/8UTkbdfDfyJaeDhlvXIidUVRGpglb9sArrBWgjyKCCh3kxRHTIimxyzLVLHQpPI0/7VQIszcfG0RutvPBX9dMi4hXhNWeYhKBv5RHW/kHoUrPWgPVMZwcRyokMrueIHKylM74dgwzwkqv5b5GRc751aUyNh9S//mAqM8y9z5my4Ty9zpiOcFmkLpw4GIt2MwNrtBQmjHNPm3tNmhrHcBjim4Opdp8dZVvbP8/O4HVE7ywWQoF8hCirwYwzj56A8fudQWx5WcRpGKgadQ3+/wRAchpX8eg+qsuBeBvsYuRXZAh11OH5NIa8K/mu8bHVdGeaq7pNGnohQDtZArD4QLJpYmwfX0P5bkmEe+3hDr50e0xCrv6fVbLGJjTCsmsHOJeL716a8d45Mp24q04iK1DTPagH1+XToNlZBGlt3ik5mPhGHEd/VyGm8vgM0sh0hsITsw/6VDRMlzxXDzux73O2R+dY rsKUN4tk MCquWcTfkuNftoJLszAnT7XkTljngcRgy8b/EDzGjIeoU8bBw9+EdJShjUC7lfr913gUfqQpWQZuTib6mL6n4n8tSCZIDzOWPkCqFcjzvn7D/4C+wFMFNEz86ZNJQGiaEq+uv7HQf3n8cw9iE+zBXz3UBuLykD1PJ13GZN/LGhSlGBrqOqlSWB7+tIHrDFKKwePmahmWTOK4N7nXE8I/AN0v6P+dQE+sojth8tOL7Dn8oZ+4= 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 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 83c8e617a2c5..6b0943397e1e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2439,8 +2439,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; @@ -2449,12 +2449,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); @@ -2502,31 +2509,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; } @@ -2612,26 +2615,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; @@ -2654,11 +2648,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 bd722f473635..8927e5f996c2 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -799,6 +799,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,