From patchwork Sun Oct 27 14:21:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13852557 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 41ACFD13562 for ; Sun, 27 Oct 2024 14:21:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C78626B0098; Sun, 27 Oct 2024 10:21:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C28516B0099; Sun, 27 Oct 2024 10:21:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA3D66B009B; Sun, 27 Oct 2024 10:21:55 -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 8976E6B0098 for ; Sun, 27 Oct 2024 10:21:55 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 61FC541B35 for ; Sun, 27 Oct 2024 14:21:43 +0000 (UTC) X-FDA: 82719595098.13.E466929 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf15.hostedemail.com (Postfix) with ESMTP id D1641A0020 for ; Sun, 27 Oct 2024 14:21:30 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=D26J1pmp; spf=pass (imf15.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 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=1730038758; 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=Ceq31KEKz4ZyyrLOVquqUBIvG/1mSUT5s9fjdMBaHqg=; b=2jIpjdbZn+SuHyISOEeoVisygU3lkfReJCCJWFdAaDrJ+84K+J5XOSBmNlKEubjo+nWKG9 j6sDSsjSbrWI9zIGY3yq1vQkoR3QEPUTiB4UDajHmT73sU5YhQUrcQnVCwAOhOAq7lJOXz mPRZsVEX68if8+3TwbwoveOFGhUpOt0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730038758; a=rsa-sha256; cv=none; b=ZX92nrItM+3l3BQzZNUjiKgB/uXMDLkOKgyjvA4wjSE/g81IqdF3iwaqzJZa8BYwBG3/9o ifPhqeoOc7YFG938fBtJellal0kHHPiJc2hLU94OISdc3grik5fy3aTybEW7HVia0bFwiJ aE80OAqVOGHXSgMNltO7RBitplUF9ZQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=D26J1pmp; spf=pass (imf15.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7F2185C5815; Sun, 27 Oct 2024 14:21:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80DF1C4CEC3; Sun, 27 Oct 2024 14:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730038912; bh=MdXpbAVJE/DdsoE6uvGP4b0+QEt2tkaMWUlj9WEQTqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D26J1pmpgqk5llwpJRrf2eMyMO9QuI3Gq74wSsBHOMI3DWpPYMd+RasCL9RyC0V+o TrMuAHGq9JbgpkV1cGs6LJyvSzVNMeTBNnM4cWjvcDGu/5gnCZkSHLNVmlCLK5XxeN YuBMXpquX6JtgzjjNfQ1oHRXidJIKJ/EJVV6WAjoZ1TC9TlKiQDrwIWKw7+dQWSoRy YTTg2cNGeeXlBzTlTrcqBxHJNfbGfmyukOaYnR5XEi9B+aBWJSMOm0Px6bNB2rRfdG i2D7Ef5PVN10ByXImp2GQkJ1J0yWFDB8cEJ8EU5AEshCRuNmt368ywSUTxf1xxOj+a YgAcNEKE78x3g== From: Leon Romanovsky To: Jens Axboe , Jason Gunthorpe , Robin Murphy , Joerg Roedel , Will Deacon , Christoph Hellwig , Sagi Grimberg Cc: Keith Busch , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , Marek Szyprowski , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , Andrew Morton , Jonathan Corbet , 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 Subject: [PATCH 06/18] iommu/dma: Factor out a iommu_dma_map_swiotlb helper Date: Sun, 27 Oct 2024 16:21:06 +0200 Message-ID: <7bf6002620085411ed65ca5ff9390189306dd0b5.1730037276.git.leon@kernel.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: D1641A0020 X-Stat-Signature: 4gwh1o75xmkhnwu5cbm3byrge1u98c8h X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1730038890-742282 X-HE-Meta: U2FsdGVkX1+cX4zalr0qJkc0X/4b2bjG3cc7E3G6lzSVBr09rRVP0LCv9x0XciQ/S+1MR5lhZM/m8xk7w3HiLMp2RQhVrrNdBbDm52buih7Rr0QmfDfGMPcthP+0YgsPJiMFFBW/FGtvBB1IpCzBXaUxXyJI59rmzDRAFj4p5WcWYpB+h3bYFLC+dTpgKo2O0Fgl4fXlf4OPlkbfBnKuAqI919H4PGlHynl/cgIPFqbuTorR7qS4YhcOCya3n/6RZaeu25hecqlE2d+aUVi9Sby8HO5DNbBtgugMiFfcNQrHxwkZei2Y9Itw1CXEaretoUXHfnMf2QNxuaeXEzuhax3WxA6rZpypdo9HxJ5UU6zbezgGtd+GAW6r43WHO+gpdg/XYkkCxxktNhn5FhsEK77gjq5iylYh+kzqNn1mpO9bdPu1uSbdiK6+HbO7gGGEQIch5e/erp7VhS8/YndoulH1dmg8knAv85zQhhKA1HA/pbfGSgF9OaGzXY6qjq4BLKys/HV2qtlno0OzMs9CItoWX7lWWuSEEf/NAizknf7L/36mjA9P9yUVk+1QxZMRZhtHTD9qW1259Ip5bpieK3eVz1YsRxUEKsYU43DZUz2ZVHH5ZEbVkrQL+TC71iXXBY+opUkZnnF0eFdphR8WIqslwtcdYhIlHusyHgZChemlDaLTn898DHf3eE9t9paAOJG/HmOkggopHJT98/mWs1sEa+l06N7ff+8S6a6xKmgbRIcn1pTgUvVzXY8uHd2RCOlsJ5VkCYQNMmEUVx7uSI5Z/wsNNRPDD96uDP/sW7xZxE7HGkAF+wi0t16Sm0EtKWb97vV1+x4BjJm4GXnisYh5Rbpx4gIf9xHzKHGGeW7YunxaBoPDAcvEhjwz+ME8v7gmh4SPYbyt8/0YaxMGr29MAWEoNJ9Yb025Dc0KqhgRxaWVNUe0xsSQT7fTkXnznFpuQGYKazoFoVz/LKy JYzYCX8e RrfvTjHJDYQNCGKmNu1705tSl+ONxXgN9LgCrNKM200pLBAEM6j6xApDmTYACvcXap0mmxGNxek3rpbScATqJmk85zNJp7JvHemmSp+1E+bDoWF2xl20x5jeFSFLsvMXPwwEOWwegAjkZsRhAAmn1ZKzqlDp4x2er0nBuSokrBV8LmoQ0b0OK9qaZiTSxiGDgumnmXTIsXV+uOk2Nbazer/19k2WY3/i2rLLGePO2xbB/AxRW1EjvX5duNFsOlMtKdEZ5CUgbHNLoI+N/i2vlFWdLZCJNO41/XDW8 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 0644152c5aad..b859f93b1c17 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1161,6 +1161,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 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 != 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) @@ -1174,42 +1211,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); - + phys = iommu_dma_map_swiotlb(dev, phys, size, dir, attrs); if (phys == 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); - } + return phys; } if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC))