From patchwork Fri Apr 18 06:47:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 14056834 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 48592C369C9 for ; Fri, 18 Apr 2025 06:48:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FBD0280099; Fri, 18 Apr 2025 02:48:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9829F28005A; Fri, 18 Apr 2025 02:48:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FCEF280099; Fri, 18 Apr 2025 02:48:36 -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 5C10F28005A for ; Fri, 18 Apr 2025 02:48:36 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3A2A3C138B for ; Fri, 18 Apr 2025 06:48:37 +0000 (UTC) X-FDA: 83346236274.02.286941C Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf07.hostedemail.com (Postfix) with ESMTP id 7CFCE40005 for ; Fri, 18 Apr 2025 06:48:35 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=h3e5TvQh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf07.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=1744958915; a=rsa-sha256; cv=none; b=qmX2cMSBVuX3COukkqbS06BaAuCFemSkPsBlFXCPKGVRo5nzI9hAMJDhqO0O2a9IxUmrvr 5uBsKM452UuilXbGGmLgYLgT14b5RxW3WXE90KCmmeAzLhMTflkwzcfXcC3KVvgblYgHkM 0YHXpkdlB0vpyuogM8sXAtp7Y8auJuc= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=h3e5TvQh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf07.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=1744958915; 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=FunWUnUPT4R85Twp/QEpBk0SWsarXHEYUs24cYHR7Uo=; b=SNeLiYvuMcjmMSHMtPwmYvbkuzztDcMfq5QJoUrp3oXZ7nOFMQLWfFYHUhGHNkF3mvdd1D SdePjgDfLxUm7it9o/5/V48kHe0Q8JaQawpIxBgwpmfFtUYCudRwVIB/UJZuartC22ZSwm XAIvwHFIPSQbQdC3cWCdAb08iMH7shE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 619264A5DA; Fri, 18 Apr 2025 06:48:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B799DC4CEE2; Fri, 18 Apr 2025 06:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744958914; bh=/SC+gdsAxeSh7Qo5AF6G2hi3wzA64Zac4qfnKeF6/uM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h3e5TvQhVlZepZfk7X3qEJIvCjkg27qxzbIBESJeIfoFXr40/WVY9qIf5tcWBvJvQ PTTbeO2Beu5SJIi993kHHx4pud3pkKwIdMQH26MyYjVsNYTcvrRLO7GLOJC2BdVEH2 0k7xxacUXgV5kInmgWv1Dv+069Rf156pppyiVIBYol0YkKFQRl7jqzpJLFG2excXSw tqNjHnUzCESdvAX5EcBPZLkfG9D92NVSiyRFD49oRC/ue8uM7YPotpyztaJGVugr7O gZPIyZ/bOMC9CsYBA46L8dCxvtY2LKMRT4uevibLwm/1PPA1hh4m2gINaryyc3/7B/ WMBR8v0aY5KyQ== 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 06/24] iommu/dma: Factor out a iommu_dma_map_swiotlb helper Date: Fri, 18 Apr 2025 09:47:36 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7CFCE40005 X-Stat-Signature: 5uxzdgtti4ndq16ktf163t3u9s7bymjb X-HE-Tag: 1744958915-742373 X-HE-Meta: U2FsdGVkX1/wujAb8FXG71J1BoNtpupkK6/xFX4Gw1+IfeDhaBdjKp0oQx9trBMAdhJn5fNgFXYjK9R1IuWGaanbGGsh2Oy+MmEJ5opvYa5PAzGnvRHkOlYZ0dbqDyRSge8QRpVW35qDFMtJ0BsYoW6MGGFgYquVSFOfYkkQQVgRFUxGtsYT4s63oigRrjRVkdFanx5vtroUdwh+8vYXafU9skFIALIpVXk/xFe4g8eW0V1QoxzB1L2ZDEHEpEaQJxDAZu3PFqLYaPap2kqXAnhn69ttNlsqn8fjHBszpfgHSp/APthL8T7y1u3zATiSzWP2DRMBuRo3vycYP+1JDI5AlG6HlWl5OZ8rHbj7LUIjh4neRHpkGFqeFVRMW5GlceQhsqQk48GK7HfflfwJEm7nlGC7mA9vybbgfoHFS6JeBvhdNAvqQmXvFKsxrurnP89ovZJVy3Jzu98Ns32ZvtnPjGSBOl7G02SRQeikXCrBcR6KIe7ecdOluRwSpTXi5EANSkG4LLvSFh0Zlzc4R8pis7Mj9uXZYUrJhiUg15xH/Mt8duOSx2fKGHowda2MMnuayd9mwPJaPZz3XUO37veRE5QNKDQwhMcsXQyt/XtFCgmVEHyN8kijWXXHtG5m2qqeBF8sVy9IhmoKP5eQse22tqhUUmZRkHGe9KgDCILECGCY54h+PPGcg+nH8amjU8yRnHC3ckBM7wgAXSy2z85Aok8zViFXy8pbe3Dyxo24BKisDZSN62uTGLdea0I2JXuklnLQL85KyGKd7TCCSIEKzbDxDwqFDV0R9rm2vwlLCUIHf7vzONTHJieN5l1NBzmK4uRiYMxSbPBiQlzhd47DH9bsXibLy9FXFDhjUq4HDw13QRhmmwz3Chj3HKroC13wjdJx58tkQLmDdTNEujK7+ZHGCtKwSy0a2+XYjiEnhk97W8QyPk+AaHtr3nGC2qzsFYiXOzqA0+hAV29 t6KcQDbb 9KVKdSP9s9iWPCg0Eu/ZaUcW8YXeysIcgmA7Lh3bs56KmbrybR1/Trr09BhBMBUK+kCBLXq3HoNmBU7xnh7xErKnlqTabH1QT1ISNoxiCgFBEZlCP4vThrpRndnwvpxjM16665cnj8GgQww2NqYnm1la97xiNIYgbmCswFStiVvAM43S2tL8fGz3cColjB9zEzaqrGbNVh13pnTtixjqoC/vzzhjs70GUoM1uSVqy1M/3ZREH5nu3MIEaV8vBjihh5C3e3y04jpIkHvohGiLGqMcZZdPsCsUXuq/O 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 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))