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 77D30C369D3 for ; Wed, 23 Apr 2025 08:14:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B7B26B002A; Wed, 23 Apr 2025 04:14:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 33FF66B002B; Wed, 23 Apr 2025 04:14:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 192D66B002C; Wed, 23 Apr 2025 04:14:30 -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 EC3156B002A for ; Wed, 23 Apr 2025 04:14:29 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 678EBB53A0 for ; Wed, 23 Apr 2025 08:14:30 +0000 (UTC) X-FDA: 83364596700.14.6F6BF9B Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf20.hostedemail.com (Postfix) with ESMTP id AC1CB1C0003 for ; Wed, 23 Apr 2025 08:14:28 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UqxMbDG6; spf=pass (imf20.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 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=1745396068; 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=0Rj1XMzXdgc2ya+trr+KhODuW9WbUYWdGvYqFrCAX/A=; b=Brjktjwfu8R4Okj3fcVasF3WccMEONXbxsdnSfvqBjz7KPnTDufCpuLfFbALFbtcJjuDrn NF8oN2Xfxe/nQndog4OaskYiA1+lwW4lMzDjP4TcCF9P7drXXNFGCa4rFrLB6PrkycFhiE 1aTK2dmj3H83JFYW96Dgm9t+7zb/QOc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UqxMbDG6; spf=pass (imf20.hostedemail.com: domain of leon@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745396068; a=rsa-sha256; cv=none; b=bjhSmRaJ/ENwayNgpL7nrDg9y8iCVkXwh0gclhCzrmuqmiB9Usrs3YjFSylEttjZJCLDpV /5M2XcPkkyskdpL0gdzRnzxu2vDj//SMpV0eR4GDgvCwOFvtyJZ6SB0wpA31jVJ2WfD8Ta b2I0iy/KU2+Z8IfkZZ5hgDx1EKzbzPY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 37AA34539E; Wed, 23 Apr 2025 08:14:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F490C4CEEE; Wed, 23 Apr 2025 08:14:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745396067; bh=Mv7I8YYM3HEUPYjUz1FgbEGJOnhUwi/LbJXqgGU0l4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UqxMbDG6CorgX3nyZL77s9bhuP8XjcgeQ+WRiz/N0aOj+40AUapikG50IXBQyXsZS Big9dbqCUvgGx1hFSGmXyVbCXpCmBz9UIptUnGuH8gL3IWp0xbD+ozIWslYx1px4u+ GwUP0i6V95reXEuFHshDbHAtF0KlVU5Zuw76lOGptXyQDVWsrH4xYhQcHZzRGI0W9N fF1EV2AO1f5O/5/tmT2EtEZlAg6D3rm4CfkJcUlQA48XpV8yIJHbc8sbiZwXowUwkZ gnOljvF67VNvqk9YmLwf2CxqiJbBWxpkKVZikgiM0vR98ZS9d9YDmQOG6WSh5xuYkb Os9QEgMm185rg== 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 06/24] iommu/dma: Factor out a iommu_dma_map_swiotlb helper Date: Wed, 23 Apr 2025 11:12:57 +0300 Message-ID: <9ef79ed6c24d12cfea7e6f491da48ae170a5f3f3.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-Stat-Signature: b7s3s39uzjr76br1tui1m61hy8ron9pk X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: AC1CB1C0003 X-Rspam-User: X-HE-Tag: 1745396068-304088 X-HE-Meta: U2FsdGVkX19EESdroSfFq1vPolHjHIVK+pdGEWahfRh5rSFmk4UW+MjIT99+N74+gwdAddL4v+lKO5+GcRbJbJS5qaY18EgLI9ZgdrCjyqidKoEbuNHXpupRP1EwWuNRKhboki1nH1/5siiBSgUkfgUGIXh/Olr5coBzWvJSN+ejd7s6m9ERcFlnzyjovS2+JBokvYt53XHiwIRBatfFD5XRVknA/AuFe1T3cIic4POzWYcDgexuAvCDm/oMmqau6i/jb6HWvehdoOqStWHUuImIQ94J+spbXHXRGf5XL3egcS1+XD2LRsk0KhSur6zjuut/BJMBbZ7j7KzJVyGhWo6sVMpU/r/LJJ2C6oPC9Nqrz68fjcLdoM4UfPpXIRQPyzYcVzq1Bj684+njPNpjIK8P6DP6k7bPXZljan/2lVX/Pkhd63+YzhMS30DcPbePnV7yIZUfHrkhFZ61vSkEVIdlgPHTHv7Up5Pf+VZVOwm1cDhJozgq56AqV5e1ohMtou8/4l7FIfqESWXveykDx3ClHXH66Udt9C/nobO1Umji4uNF2QS1A7ocqsUdMu6CdhI6428HT0sROqR/fDt1B4PbHgSNaychaFLBSqUox4u1VXXQ/wpTUDNm8L7VRhT3TsEmFhWpqLv27O/KLUnGUv/9r0Ndjj/gE69MNLwkD7pvS0duqhNqF8kECp4+fqU4/3WPnByp8bqaZPPpDYsJGCtHoNfau7DkTGpJ8gMmXIw+9zo8r+V8/H9U9DclUlbdV3Xwftet6dT7O0xKag6Bk4rwedoS5ovEpsKdHMIb5B3Q5TFqfVQD8yEyYqDyNM8mbxKU/TMGeIL6aCB73WmFf0Z4W8DyPoeKvJZsoCGq2wNKWkJ0ZSkbV9AP9V4Lh7ScvDY4cVtmLsVxkz8ii1RIC1+eDZfHzHcANotvPp0XlBrBzMbLpcs2wqukIB4NzjsOzHWO0CEWnjNdxSDlwCY brP/sKNU FUO+2BTeRME7Qm4vhVn5tlgaw9jzT61jyEWFxeiBIcxVuyUv2bzfqThkMWFjdWocNQd4V4FDxowYdJ84haiP9GqIISgebiZe8EfOS3rPH3gfZ+Gc/pukXzBh7mr50MjmBYDduzwnmjfmLAxCSxv+8a9Bg0e980b4E/DtlFUmu6pDMNOJLT6NpxV2uLenF8FcQdL7MIqXhHJFkb/EyXhq/pwXNmfr5Epd4gt9QQ4s2GsPwy8CH8x6Y5nuN9IDgRJfcw+PpZT8iTnMYN6hbeq6EtoOSwILAj2pGEYTr 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 Split the iommu logic from iommu_dma_map_page into a separate helper. This not only keeps the code neatly separated, but will also allow for reuse in another caller. Signed-off-by: Christoph Hellwig Tested-by: Jens Axboe Signed-off-by: Leon Romanovsky --- drivers/iommu/dma-iommu.c | 73 ++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 6ca9305a26cc..d2c298083e0a 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1138,6 +1138,43 @@ void iommu_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sgl, arch_sync_dma_for_device(sg_phys(sg), sg->length, dir); } +static phys_addr_t iommu_dma_map_swiotlb(struct device *dev, phys_addr_t phys, + size_t size, enum dma_data_direction dir, unsigned long attrs) +{ + struct iommu_domain *domain = iommu_get_dma_domain(dev); + struct iova_domain *iovad = &domain->iova_cookie->iovad; + + if (!is_swiotlb_active(dev)) { + dev_warn_once(dev, "DMA bounce buffers are inactive, unable to map unaligned transaction.\n"); + return (phys_addr_t)DMA_MAPPING_ERROR; + } + + trace_swiotlb_bounced(dev, phys, size); + + phys = swiotlb_tbl_map_single(dev, phys, size, iova_mask(iovad), dir, + attrs); + + /* + * Untrusted devices should not see padding areas with random leftover + * kernel data, so zero the pre- and post-padding. + * swiotlb_tbl_map_single() has initialized the bounce buffer proper to + * the contents of the original memory buffer. + */ + if (phys != (phys_addr_t)DMA_MAPPING_ERROR && dev_is_untrusted(dev)) { + size_t start, virt = (size_t)phys_to_virt(phys); + + /* Pre-padding */ + start = iova_align_down(iovad, virt); + memset((void *)start, 0, virt - start); + + /* Post-padding */ + start = virt + size; + memset((void *)start, 0, iova_align(iovad, start) - start); + } + + return phys; +} + dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, unsigned long attrs) @@ -1151,42 +1188,14 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, dma_addr_t iova, dma_mask = dma_get_mask(dev); /* - * If both the physical buffer start address and size are - * page aligned, we don't need to use a bounce page. + * If both the physical buffer start address and size are page aligned, + * we don't need to use a bounce page. */ if (dev_use_swiotlb(dev, size, dir) && iova_offset(iovad, phys | size)) { - if (!is_swiotlb_active(dev)) { - dev_warn_once(dev, "DMA bounce buffers are inactive, unable to map unaligned transaction.\n"); - return DMA_MAPPING_ERROR; - } - - trace_swiotlb_bounced(dev, phys, size); - - phys = swiotlb_tbl_map_single(dev, phys, size, - iova_mask(iovad), dir, attrs); - - if (phys == DMA_MAPPING_ERROR) + phys = iommu_dma_map_swiotlb(dev, phys, size, dir, attrs); + if (phys == (phys_addr_t)DMA_MAPPING_ERROR) return DMA_MAPPING_ERROR; - - /* - * Untrusted devices should not see padding areas with random - * leftover kernel data, so zero the pre- and post-padding. - * swiotlb_tbl_map_single() has initialized the bounce buffer - * proper to the contents of the original memory buffer. - */ - if (dev_is_untrusted(dev)) { - size_t start, virt = (size_t)phys_to_virt(phys); - - /* Pre-padding */ - start = iova_align_down(iovad, virt); - memset((void *)start, 0, virt - start); - - /* Post-padding */ - start = virt + size; - memset((void *)start, 0, - iova_align(iovad, start) - start); - } } if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) -- 2.49.0