From patchwork Tue Dec 17 13:00:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13911731 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 83A29E77187 for ; Tue, 17 Dec 2024 13:01:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD4146B00B8; Tue, 17 Dec 2024 08:01:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C85666B00BA; Tue, 17 Dec 2024 08:01:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD5A66B00BD; Tue, 17 Dec 2024 08:01:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 84AE66B00B8 for ; Tue, 17 Dec 2024 08:01:14 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3DFC4434D5 for ; Tue, 17 Dec 2024 13:01:14 +0000 (UTC) X-FDA: 82904460198.03.3237AB1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id 2AE24C0022 for ; Tue, 17 Dec 2024 13:00:35 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=s0fi647N; spf=pass (imf28.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734440449; 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=0FqhNjObdXfDKkHCnVN9UX0TbpS1VASwgY/09lRbjWXQo6DNpkBuuQ0cSnV9Db+RdCQNkE a5o39tsRcss2f2f0lgVH9j/+16VOIvflnxMNZmip+idhfSOaw72Qlrh5w+iWKpxRBUuZof Nn4vWwjJYskUBvQl9qWvZk8v0RzU8+M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734440449; a=rsa-sha256; cv=none; b=7W6gjaneLQaZ9jGLsBhqBohIpdjyRYn2FokQ0syb/jfligIdbg4uWeWlwwNWxK+kWre/VQ mV6TO3IWFeC4cth0glq90unAUGSyOYY5RCGLf73uzeaLSvk6w5YBHL5xBx1TKTTSa9tS3m hoS+ioQ/c2reO9KCfXK7MtKM+FXV6+8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=s0fi647N; spf=pass (imf28.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 78EA85C6287; Tue, 17 Dec 2024 13:00:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B54E4C4CEDD; Tue, 17 Dec 2024 13:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1734440468; bh=/0RFbzCxs3bUpxWK8zAtOzrecMeBWxfg1712GxHC1Ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0fi647Nb8GVEkeVCdPaHOKtwqPlRztHjV3Lc+Y+5PVL8Q/Lx/xB6HVtlOG3eAEjD jRGNtRML5z6w9cRl/zeu4jESEygSJggzd3jLtUSKmmc44m+WcoG7QPKTd/MKteUXv6 JarFXlBS4rgl7Trn0i/Lk1VAOFfMlP4fcX0p/8uXxMlb0yzeTKBoZxiMSR3fx6j6Yw 40r9N3AQmTbU524pt3d3QtO7B7mMwqluy5Af99bG9ln4GINmne3EndQ+ExmKGoehTt qcP1PMX2t62/vzVITbDQSq9R6mEiCNy7JLr6lTB1uXIBZGqbt6VYLfGkB0Zwsd77L6 4kGPMi2MQ8+2Q== 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 v5 03/17] iommu: generalize the batched sync after map interface Date: Tue, 17 Dec 2024 15:00:21 +0200 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2AE24C0022 X-Stat-Signature: essmkj8q91qie7br7xs9s7ypgk8eubua X-Rspam-User: X-HE-Tag: 1734440435-264119 X-HE-Meta: U2FsdGVkX1/ccJz8dLKVo0Ecx05Y0doRWTt2+qICAFDVUEcCDupf7yDVCWszC5uBBoUhKqnoVMhIjRps7u7MqPKkx9to61KF2gEdIgfqPUyd2R//PaJfE/AMico0nMAuNf1DN/rcrdwoghHCecDfjgzgUQlgdj3W1jpdSqpJQhIegIu0XTuzoOmGs/wZsI9ko6RqUNM/RFhFmyLFnnuW7UbfcYuxwE2Cu+hLb61XekwfQ5JN1+reC2MntI9q6EZloY3DKOT0DICubjvAqqynESTF9hQFbHZwZ2ebMLVsuYyRgHumNv1CuCcn0fNrA39TIwkw2NF1XxJMfi9MBqUTU/p0FfcA4plK+QHh6N1o8y7KJfz3w1NMHOJB4zvFDeIuvoZeDet69mR4sp+/ziC6WfBST1N6ftJUCzTMnIPo7LbPU6HEvtdyAM+7P40nWoCReyopxiy0yWKsSMqtosT+5jBS3iRrmHfhGbJv9ytp+oxXRLnKmZwpwA/Seo1WyoegltwW9q+DbUoQw+2zmjHgRGAT51CnBrjkO18zEgsXYO3eU8+osvGXHDiAtBUHKHeoxDr89TUsVShMdIjVFBI5s5Ny00TsSILOD0e1obgbVRMqCztBPk6xfmC5Hz1bu4q3ZlNRwJlKvOkkigQ/XdH/hAATN5iRcCg9qd34ro+COOfjAP/XaSAz35llGxrGNveIA7lCx4+XmmSez7Q4zkpbEkKG6PW56rHPhEIo3vJnp+CDkkWHfsw6ZbfQdweiPJsnE1ML6Lwx6s4/aXzTyRxzCrEaIkHcnvNvNNXpe2oAwE6XJjeXxxyCTDSR8chgETc3xpXcC8+z39f5uKAy1zLrhdK2kx05OnwPhA8kuWrVwXPDWdGA2n68ClVsjy5HzJBPb5YguvJR7yhliJ0jx3xlfJp21c46indagHq6ancAJ9CGOuEv6DgvgBtdoyykozX52PMLAmywYUL5NxW2LME KGZlEVbZ qmamfOml7ITOCSg6CiNIRsKo3dKToxe+6oEkbzRRdOPkim9afUa4/FYFupe1cWVv9zm3zoA0hf77z2kRV2/m64WECwkenzs2mQrqDX+8mBrNaTsvYbOxF8RAimQM42vgnG+xf2kq/dpuie+7hQ4+2AWaAxzx7aSD1uYqwYe8wBIdNTjKshB3kjeCuCel7ycjE0PncTAY+tFAFsC7zUiTIDXuHfFKWdf4NPbkltmAB2XwTLtjEBGGEwQ11Yxynq1RX+n1Y 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,