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 D0BD6C36005 for ; Mon, 28 Apr 2025 09:23:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D78466B0022; Mon, 28 Apr 2025 05:23:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D26456B0023; Mon, 28 Apr 2025 05:23:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BD4476B0024; Mon, 28 Apr 2025 05:23:08 -0400 (EDT) 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 9A8496B0022 for ; Mon, 28 Apr 2025 05:23:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 92AD2C0E75 for ; Mon, 28 Apr 2025 09:23:09 +0000 (UTC) X-FDA: 83382913698.21.CBDB071 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id F22491C000C for ; Mon, 28 Apr 2025 09:23:07 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PqmGfJdc; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745832188; a=rsa-sha256; cv=none; b=wdvytaSNTCdSdIO5k1EarlbjEj3FNiBFuRXSFk7FmVEybDEhXjJzRuUMDNjxKrfD15KgHa 4c+HHVXqHqL11k5HkiJKl2JctsgIMJp6MNF6/dRYMq8TmAtX7/4E8rq8Jv7L+cf2RIVCG0 GpC7HHkvDSwLA740TF2LJSIjGGoUg+Q= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PqmGfJdc; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf18.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=1745832188; 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=nmbXPb0X9HjPUrdGqA+ZMXt9h17Klq2hlC94dBEqTcE=; b=2OT1WLubmib5G1D7NRmky4hDjxmzcZH1z+Bt/Sj8yZMaFWCsaebdQSrvPkM8xw9UuzQeeI rxc8ZpWxN6A8bE5KrVE26b8djKUeNPFWsXeFL3FlBk/5mge6V2sB8vxxgFGs5qnlxO5qLt 9cp0o+cou/7r5Nbhxn5rTZUzX9/6A1M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 230D35C62B1; Mon, 28 Apr 2025 09:20:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B7CFC4CEE4; Mon, 28 Apr 2025 09:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745832187; bh=0JHkJ3yc+gAWUe6Cn00MEeufheTpl4eLgTynVx9oj5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PqmGfJdcNXSWtK9ZUr/VZuQVATSjN4FCICu9QvOjQ5DFimCvpDJNBXHHRfXKE4d0f JSfdtg+/yURTLqlGkkjWhIP/+bLkaey8ndkjjCWv7Pmda9drOgqolG5sO0/xK8phy1 M1bamGvI/HUYk59FrSxjJodLMEVZQAN0v0cnSkOGKPCsab0uBqMn4YH97NLy505u+y NPLiCd86bDRwc6qTWqjtnq+cD0ihAbz1ZorWks4/3uOYAZsA5mAb9TFncOXGZM5Gnj IOohfCcCDYKXmzfgsFUUlIffxZ68XVFQiK2Q4uEACJ73pihFUgrcFqu4MHI/n1tHxp roqnmUkSZ/rbw== 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 v10 06/24] iommu/dma: Factor out a iommu_dma_map_swiotlb helper Date: Mon, 28 Apr 2025 12:22:12 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: F22491C000C X-Stat-Signature: 9jkhzggc91ciwimjosxremz68m668k4q X-Rspam-User: X-HE-Tag: 1745832187-415001 X-HE-Meta: U2FsdGVkX1+Yg2uipgyNZKybxxbj35Zq9kRMECsPDTen93RA+B30ZGC7u4xaG+TaoQaQ88qVnEsk2fMOc03Xgj+5uOLgrND+9fCTuRnd7eTYM19JxqImlly0xEEHuXq1pO+1cLraYdCAEjjEyU7coCJcw4yYTrw8al0DXRXxE7p0QNhmkku7Mp7iWAWLlZfSgOfCKMUxRRc1WXb+nFzvx0C0bdaW3eXpdzPUY0yTA3vktJpdAh6BVcD5M6/Pgu07ZK4ps3Ec6RUVuJsnbVsRop6M9VONGJfifL1TPoseuOFruwFQSyI+DykBPVZv5kdjNGcgruiDV6Z8zHaoyDtZDzNYiTtvVUhi5gW7q2UeQJXlMGmNRy2dkD3jfqglcynoEufCN0DSg/APjEFhJF3PpEiFyIl36sSgWAeCQ5C0Jh823wC/E9tNzymVlbQ6T/6EZ+G72re/Z+V/en+LkaZq6uAHM7JmhUCzrPJ0KPPSyf+IH28Rt3sfCTg9PQlu3j82KSfDYcLi0Vuyi+CaeHocdvr458HHIAe6Qm/ZjBCTLmPgQ5WPVHaJT/OeBM0n0pVIc5aW3Gye1I1K9l/KN6n1/sC0XU0W+1E3ham206JOarWb57hzK+zbb6eGe0KnSg/GTRQP/oniNw3yAZ4boaX1QpfsmeESxLH5+aeVnFinRGDNNsWh4ltf9b3TjlHFOLhAfqRG75UIs9lAmg82V1abwsqw35q6x/az6q47OEgLJbqV15Zl22LOpsZo+DXMlG4gcBEIHQ5IOmAHMKATIobX4WLXCFYfoggg+s0jIJxDqfyb7BNrYOCqbiV27LymiLamUT5PAAoFy6y46ep41dHO59pqRYlv0ZNRbPJ9/NbRYiFvZH/wE2KNk/PboVC027e+OvffzQJzbPpUisHEZFeaZ1NZJ3V6SmciSrmgaZq3sY0JrxJCluaCeT4AUcGzIlJbNcZM5xFFSi9NZtWHw96 HjRGZ9SX WABYF6lyTG8RPxKH0bR7Taeac7kzEkBpMnCuQKsHGZ9aXfPDF5jazHmSTRM+5m54LkLO1DPQWtFWGNlEH0uLfeRyUUO7DmxN2U6MUICX+rdLc3tlTzLuKg35sRGd1tqJpQppXUV9ZBorYNv20sWFf8RDuw57L7yQfd/wLM5DySzDkmEtT9Lr511aviZRuIzQAk1evrCuZn4x5mF4vWZDmHFUxCf1vTB5hmomH530sPRF8Zmpm7d+6CmPs5WA89mQVDTY0jkfkVf3D8rMLpj5gNMJo65A3gQuFUS7zWDgaZ/BIxOEuIILZIIddJQ== 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 Reviewed-by: Luis Chamberlain 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 d3211a8d755e..d7684024c439 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