From mboxrd@z Thu Jan 1 00:00:00 1970 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 06036C369D3 for ; Wed, 23 Apr 2025 08:14:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CEC956B000E; Wed, 23 Apr 2025 04:14:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C73706B0010; Wed, 23 Apr 2025 04:14:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC7996B0011; Wed, 23 Apr 2025 04:14:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 872426B000E for ; Wed, 23 Apr 2025 04:14:03 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F26EB1617ED for ; Wed, 23 Apr 2025 08:14:03 +0000 (UTC) X-FDA: 83364595566.09.FF65009 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf06.hostedemail.com (Postfix) with ESMTP id 49E9F180005 for ; Wed, 23 Apr 2025 08:14:02 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iWRbBV32; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf06.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=1745396042; a=rsa-sha256; cv=none; b=S4eMWtDWMT2850CuLVAomUvlkOVFnRfdBYxwZq/dn/6EBV7rw+RFNgM4FKqQSsZvB2ABXR Bo9pOtMMJbal4uUA+y+3ArFv7ICNcEs+4Bqo0erXY5/hHoTugsBHRj4K1JsqC1rysMArcO c1Tt/WVRSrMTFQq7LaRTgA2qbat6El8= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=iWRbBV32; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf06.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=1745396042; 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=VBhxS03x/N+QPuvmIttk61Cuvg4jv0PZyZSVf8talVI=; b=LPySb5TIZQyp9xwBFMdyKUs81rnmCXYOBT9KVU3KBwAm4Ca5v3Ac806ERvu0defhx/8v+X 4z4TZFTkzTZcpSv/E2WVhr8mvWGSU9yIw9awKU1ANiyhyUb6CcixftCE7wDwkYdFG6i3HI 0vwvTJxV5a2vDMcOo3/nUBoTvKlLl60= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id C7D374A520; Wed, 23 Apr 2025 08:13:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 324F4C4AF09; Wed, 23 Apr 2025 08:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396041; bh=ntyAEM4ivirILRCYAooDxCIgXhWM3OZDXa/hz/Q6s3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iWRbBV32dZZ/UP0AVVSi56h6eugDoKF8qNS6m/jZaAzDMfPfeebn0s1U2HsFGOCoD U/E9tAlfuub44yG8kx59Kq15s2hJ5BwwrhPMB/JTJ546biCbuua4/H+lLuj5Zczkqj Dgd37kJDP188KNQWPP4Q+FcX64FrWMliiQrmFXbRvzcRkW8Df51gxoOWhisvge2x1J sDNzYAVRO/SRXF8aUH03r/owPqxSu1w5Bkb5elEzsvEB1YwgAA8AMhPvpU/mcDsxDV gNm2Xpw0Whog/lQAcI09Ri+zG9uFdFkEy7JPOOXVwkvzTqaTUDySSrESKTsDga1iXK S7gNWt+6A3OWw== 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?q?J=C3=A9r=C3=B4me=20Glisse?= , 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 v9 03/24] iommu: generalize the batched sync after map interface Date: Wed, 23 Apr 2025 11:12:54 +0300 Message-ID: <2ce6a74ddf5e13a7fdb731984aa781a15f17749d.1745394536.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 49E9F180005 X-Rspamd-Server: rspam04 X-Stat-Signature: yscs8k5wywgozwpb8cqzmuurwmjw1qg8 X-HE-Tag: 1745396042-804564 X-HE-Meta: U2FsdGVkX195fLJzCkBi64XuvdiFz9r+laCFIHa6QduoLouydkqJdIKDe8gahEFDGuf0IjC6CefUK1vpCt9jR4K9k21gFCf/WKg96BlUbe3hJeeG0mOQaybQ0KTihYtVFw3CKW7LOlAVHz7V8ReupaE/KEzZl/MFlbKHj5q2TUrCBziOvjScU6QVG7/0EPfyO/WL8bJ9/5vjjEaeZSY83SrS86BdgXZ9B429l75SfqdloXdk49F8Dkq0GFuH4dR4knEVT8dqPWqpJKIiXoCJRJjHcrCI6WqAa5sVBO9ur3E5ECQ43rW5WMwrBpRraYg2bdappryOi38KsA67dgqbXgCZPsXXKPdSG5CvuapqeD7PUkUKBuFgJfwjsmvmoskgTuVZvet1AgidgzqrshRUU7t/DsG9XKY1q84J/THW8XRvX7VVjK5MkEuKo+9VALndY6L0w+413xqRtka3saFTOpVzYGunIpDjm8PIUYq8MMACxJWI3acFXNlXTHX11rlp5Pqce81gIFZlG39tCUayt2eSMUn8jlNfkp1BLwho/OsTZxcezBYw64Z6hs1gbWvjEZuG3f0NzFfD+FIl4kno/Grpr/a3BcoajQjdiEgODzyI74IIdCFGYmS4ZYJGZ4cMNrrJtWT3YAx4iZeTrphVOp1drf44ZHB+qsBCF/GADKBspuVK0lePiqJ4MVHec3FaOyzjvBlgtch6X7e648jh6HUjGCI0Y61WHTtxo4Q+a9hiZ7U37sgnJ6IDm7PDK1+pa/s4gjkBFrafvgS9oS0GByVKhIN+1CeG//4aGa+zclh7ksr+hRvOQ5u+Wd2DVsWJnjXdxTbHugGmedbbx6dqEXVnpOEL+5U0fhwSJUpLFISuQPsYQpJ0QkpgUlfZmH+nauRGjodSDwgWZHqRdMqg0t20XKJkPsAv3qY57V0JQTNKy+ul9X02D9VqtPQkQALN27aP9RyZ8rXGI/rlAWJ gr4/oZgI +B0PnRcXY6xi/qCXmzJPb3kPRZ2nzRCGirdNS3Jo153KQ+gaRDQt8INrrJ3RCa3147ykK/UNHU37C/6I/Z+g4qls5C9T1Soc3cAIxXkqcaYosgzQkgARz1e/fUUuhGe2ZlZH4KB5Kjj6P2optaJ3R5mrWY+dQsGO369gx9D1Rqh1a8Bh9cxqZFybSES+ppZeCuLgWOa4RVYJnEdaJLRTIS8/yLQn1u6S8h8tJVzwk7vKNZ4i11G+Oa9etJVBCeWOAs6S8 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 Tested-by: Jens Axboe 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, -- 2.49.0