From patchwork Fri Apr 18 06:47:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056831 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 BD592C369CF for ; Fri, 18 Apr 2025 06:48:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C869280086; Fri, 18 Apr 2025 02:48:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 179A228005A; Fri, 18 Apr 2025 02:48:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F0C70280086; Fri, 18 Apr 2025 02:48:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D1EE228005A for ; Fri, 18 Apr 2025 02:48:25 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A2D22C138B for ; Fri, 18 Apr 2025 06:48:26 +0000 (UTC) X-FDA: 83346235812.04.B4C6B93 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf19.hostedemail.com (Postfix) with ESMTP id D58E11A0004 for ; Fri, 18 Apr 2025 06:48:24 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZwiNSKPL; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744958905; a=rsa-sha256; cv=none; b=fPOgZFNft1z6gfNrVvosM1LUHjfAM8KiAuxKdPsRfCbHHXWZqo0sgH8/2MCa0whNMHFz7z FGgc903VOnGycOjtRrCeoC04isyPIcDaTkdSOKJ438XDcBbhp1nHIABju0ygeyuJNKLQDQ 0zeUfRTxUzQkV7896NMWc3gw+QnwHmw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZwiNSKPL; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 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=1744958905; 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=+eCLWOXPvR/5TmwhEeYW9jMuowqWtO9nE3OVqSwFYoM=; b=IHVyl3PQgIMzmW2S5uGfVOYtXtnxyd8BjM/6uVnmDeec6vhVu/PtPMmXJGdTII8ESDz+FT viIU4FahheDdlqz5vjwjovgXWnDoCB36dQydPl0P91n53RWheAK0E5GWfKEbwTSh0Awt1a MoG5CM2Y5nnZpC5uEvZE5ko8AziFLys= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id AD8EB43A09; Fri, 18 Apr 2025 06:48:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F072DC4CEE2; Fri, 18 Apr 2025 06:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958903; bh=bc7wd9I07pkxti06d5hjue2r+jl+zoQSPicCZsMnjEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZwiNSKPL7JS6GQw7b83BM1V+v4d/T3O2pcgm6YM6I0aRcjlGkQ1VBYSI4dmJ1UqT7 5F57z1YN6+OnGxzGYHl2oS6JBMPQ9jeh01Pf3EJplI04dPV1Sa6TGnhHXo7t02+yGc /uIeBAN0fypyjxLB9WSnHR2/CaAO6LpIqeiyZpV13lP7fM1FZAvGidl4zgXjesFZIR 7Jbv5S4oZN3xjjY5i6Kh72goqblKPxTLuzKauINkbDD2Rp+uAKOb51guINVzU9Bwud He+dQ80/rF5BEr306ZPliPbUJCq+itB1cQAJUI7rOEFJ4yyi9STvoxU+Dli11DECxq gCh9HgDv0LpWA== From: Leon Romanovsky To: Marek Szyprowski , Jens Axboe , Christoph Hellwig , Keith Busch Cc: Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?utf-8?b?SsOpcsO0bWUgR2xp?= =?utf-8?b?c3Nl?= , Andrew Morton , 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, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni , Leon Romanovsky Subject: [PATCH v8 03/24] iommu: generalize the batched sync after map interface Date: Fri, 18 Apr 2025 09:47:33 +0300 Message-ID: <2aadae2aad22deecfcbc795918cbdffc263a6147.1744825142.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: D58E11A0004 X-Stat-Signature: 3n6w3otbwz47bqz5rfstpph9fry6cnu8 X-Rspam-User: X-HE-Tag: 1744958904-604136 X-HE-Meta: U2FsdGVkX1+QhY8FFu141Xw132mT9byTyMsSGzZOtxZGpqzvsA6V1z6A6Kk+18xojiGiYWYYF/k8Zs5EzKZM0dh5LZ9p907Eck7lZKodh8Sqvqx9mFqmCtnZHIAFTVAGwU+86+iqTw3qw6KWeEG5oIVYYhQLbKP9cpdwaqn74yzDt3JfaDFyJl8mwMww/E+2gy4+S4f1sUzzXtLJQ/8PWVAoesCEKvZZ8uaMjoGxGk2oiPB24tBIYv9zNzuiI06gsGjb0m/ZuwGmA6JqmVsrx9yPkdPFHg2xogDU7It/tuZz8CKp+9EribKomu3iXtVV52C7sFRUPFLzvT+TR9zu6OqJEhwAcmocvGAwRy3Qt+/efg+PHzVhzO3zRwDtPVsK35RpP8/YxhhlcG7I/8d1ydHHtr6Khp/YREbHw17oC248L1g4KZ1ZeX2RgbYnVzRkfNRPpoBudHgTPCXNun7Sx2wI6Sy/BDNNFC34uc8FwDZ1tXs+T1ZjQ45FPDUo8myB2kSVLndMdCMJQocbilbTtW9+E9/esBALpdiE3XX6q45HkR33RAJGIYvYkWQCruj8uQzL4W/Hm1D4qwO5ufy1fNK0Jh95ZLmhvVZKaRpGZmYJv+4GZuJL7CgVubfOD8BHkelkBKBH00pb34SSz5pTJdUqSkx10PCLYqPjJcwtsR5kwTxCU+ZNPfDPOueWipRy9O1IjLvHgof5P/blQpvYt7VlnaFCcjZAAKtiDUnaapWQ4JcXUOLEbacXoqyAfAP4yU+fKTvl/sPq772r9n7mXyfJ8e+lULnOWOO1EVBcT/vd9cIHN0jvk9bD7NtSVu7pEBTcl3ZLXKbeTX/qQiW+qcJL5+rQArwi+/nFeALMuk/9KEtS31Leui/2A30Ffb6JSoro4t0xg61pDbA8fti4RHhGq+ANdkX1nOLI5jHBI/L/Kbt/JH+c7qW5WaZjJDFgrv8i7Len6JBYvAknrll XQQWKqGO B0zM2CJE7f0c1dwopx0tIe/MyodPG1Bxet+8Rl2sVods7elQpUKYWz3XjT7vb7LP313RLUozGCWWpcMnEkuZ+DXbsU8PunDyDABUD333yyeQUy/bkvQj/w5bOTiQHuujXUxLQWZ8w9v8jD/gERlooj/6Qq87S4p2M03sYZMv1AADKFxduedIdTSexX1TY4tJ7fue+i9pbBtdkvkLcwt9KLi3xaIuePCM3h4uEG7ytb0wXKph+q+iHucXf9sLosMen6fg3 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 c8033ca66377..3dc47f62d9ff 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2440,8 +2440,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; @@ -2450,12 +2450,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); @@ -2503,31 +2510,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; } @@ -2627,26 +2630,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; @@ -2669,11 +2663,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 ccce8a751e2a..ce472af8e9c3 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -872,6 +872,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,