From nobody Sun Oct 5 14:38:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1754311437; cv=none; d=zohomail.com; s=zohoarc; b=f1WBaqoCfljOWOnmeY/5u/TK40L5YIBN5IT6DZXUkSrgKzpFUsO4k7sYxPuIi24ad1dPvwMFU77qAmobh2I/VxzqOZlNrnn3h+MNzUdeYWmJGC1cJhssaHfOxncDzm2eKNgQAPM33mkeNLmhPez030e1mokWnca8e7nHoCfesfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754311437; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Yob5vGImG9Fz6Q3IIoENTL3tAbucLWfbEG7h2+LdGFM=; b=HKCzcvfSH2CIwscj0WL1lp+SbakS3Jur4vwCpqaZfRFxM5rA+h5uyMCcZOF4eDuzFcAUge4QmeFWZS6zr6e/DF25cId0SXx33u+ch9HczQL9KHi0p2SqN1H458jXAQKgPGxGSJAL8k+kWPa42aZC+qHNEFp+PWfiCoyz4jMOJAc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1754311437007696.560166409128; Mon, 4 Aug 2025 05:43:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1069175.1433036 (Exim 4.92) (envelope-from ) id 1uiuXY-0008FI-Ix; Mon, 04 Aug 2025 12:43:44 +0000 Received: by outflank-mailman (output) from mailman id 1069175.1433036; Mon, 04 Aug 2025 12:43:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uiuXY-0008F0-EX; Mon, 04 Aug 2025 12:43:44 +0000 Received: by outflank-mailman (input) for mailman id 1069175; Mon, 04 Aug 2025 12:43:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uiuXW-0006VD-Il for xen-devel@lists.xenproject.org; Mon, 04 Aug 2025 12:43:42 +0000 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a60fbd40-7130-11f0-a321-13f23c93f187; Mon, 04 Aug 2025 14:43:41 +0200 (CEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 5EDCF4423C; Mon, 4 Aug 2025 12:43:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6868C4CEF0; Mon, 4 Aug 2025 12:43:38 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a60fbd40-7130-11f0-a321-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1754311420; bh=KuB85oQ1zEvHewxjvaa7TgR+vPeGP91gwiah2Yizc2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hwpc/2Lt2D3anuuHX/CywReJ+JevkzY6FynhQNLZcPcidH3a8z4Y3cZmYKqJx40aB HuWBeZEysO6t3oSzFklaWg8fzR58b4rw4vPFNALiUc9A9irWH9TDeW0nOLlTcNMjg5 8y75jvY8oofTniAsxP4pz8Mu3KaSfgmilMiaTliZ/mjlKSNBhY+c10mFYtQHZ4AR/7 Xmk6xDyL82OWzMQWw/B3tiObakK+I7qRBS7g9Wgz6viepi3WB5CZHiWKKRcEEGPKzI Kj0BbJnhOLGzRPSZ09k5YVjeQRC0y6mBjsRtkaL/iwYbfSRrLhH2F4a0OA4eEyJn4C wZIRnvkij7dkA== From: Leon Romanovsky To: Marek Szyprowski Cc: Leon Romanovsky , Jason Gunthorpe , Abdiel Janulgue , Alexander Potapenko , Alex Gaynor , Andrew Morton , Christoph Hellwig , Danilo Krummrich , iommu@lists.linux.dev, Jason Wang , Jens Axboe , Joerg Roedel , Jonathan Corbet , Juergen Gross , kasan-dev@googlegroups.com, Keith Busch , linux-block@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nvme@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-trace-kernel@vger.kernel.org, Madhavan Srinivasan , Masami Hiramatsu , Michael Ellerman , "Michael S. Tsirkin" , Miguel Ojeda , Robin Murphy , rust-for-linux@vger.kernel.org, Sagi Grimberg , Stefano Stabellini , Steven Rostedt , virtualization@lists.linux.dev, Will Deacon , xen-devel@lists.xenproject.org Subject: [PATCH v1 06/16] iommu/dma: extend iommu_dma_*map_phys API to handle MMIO memory Date: Mon, 4 Aug 2025 15:42:40 +0300 Message-ID: <09c04e0428f422c1b13d2b054af16e719de318a3.1754292567.git.leon@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1754311438376116600 Content-Type: text/plain; charset="utf-8" From: Leon Romanovsky Combine iommu_dma_*map_phys with iommu_dma_*map_resource interfaces in order to allow single phys_addr_t flow. Signed-off-by: Leon Romanovsky --- drivers/iommu/dma-iommu.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 11c5d5f8c0981..0a19ce50938b3 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1193,12 +1193,17 @@ static inline size_t iova_unaligned(struct iova_dom= ain *iovad, phys_addr_t phys, dma_addr_t iommu_dma_map_phys(struct device *dev, phys_addr_t phys, size_t= size, enum dma_data_direction dir, unsigned long attrs) { - bool coherent =3D dev_is_dma_coherent(dev); - int prot =3D dma_info_to_prot(dir, coherent, attrs); struct iommu_domain *domain =3D iommu_get_dma_domain(dev); struct iommu_dma_cookie *cookie =3D domain->iova_cookie; struct iova_domain *iovad =3D &cookie->iovad; dma_addr_t iova, dma_mask =3D dma_get_mask(dev); + bool coherent; + int prot; + + if (attrs & DMA_ATTR_MMIO) + return __iommu_dma_map(dev, phys, size, + dma_info_to_prot(dir, false, attrs) | IOMMU_MMIO, + dma_get_mask(dev)); =20 /* * If both the physical buffer start address and size are page aligned, @@ -1211,6 +1216,9 @@ dma_addr_t iommu_dma_map_phys(struct device *dev, phy= s_addr_t phys, size_t size, return DMA_MAPPING_ERROR; } =20 + coherent =3D dev_is_dma_coherent(dev); + prot =3D dma_info_to_prot(dir, coherent, attrs); + if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) arch_sync_dma_for_device(phys, size, dir); =20 @@ -1223,10 +1231,14 @@ dma_addr_t iommu_dma_map_phys(struct device *dev, p= hys_addr_t phys, size_t size, void iommu_dma_unmap_phys(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct iommu_domain *domain =3D iommu_get_dma_domain(dev); phys_addr_t phys; =20 - phys =3D iommu_iova_to_phys(domain, dma_handle); + if (attrs & DMA_ATTR_MMIO) { + __iommu_dma_unmap(dev, dma_handle, size); + return; + } + + phys =3D iommu_iova_to_phys(iommu_get_dma_domain(dev), dma_handle); if (WARN_ON(!phys)) return; =20 --=20 2.50.1