public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>,
	Christoph Hellwig <hch@infradead.org>,
	Kevin Tian <kevin.tian@intel.com>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	Hector Martin <marcan@marcan.st>, Sven Peter <sven@svenpeter.dev>,
	Rob Clark <robdclark@gmail.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Yong Wu <yong.wu@mediatek.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Heiko Stuebner <heiko@sntech.de>,
	Matthew Rosato <mjrosato@linux.ibm.com>,
	Orson Zhai <orsonzhai@gmail.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	Chunyan Zhang <zhang.lyra@gmail.com>,
	Chen-Yu Tsai <wens@csie.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
	Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v4 10/19] iommu: Add set_platform_dma_ops iommu ops
Date: Wed,  4 Jan 2023 20:57:16 +0800	[thread overview]
Message-ID: <20230104125725.271850-11-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230104125725.271850-1-baolu.lu@linux.intel.com>

When VFIO finishes assigning a device to user space and calls
iommu_group_release_dma_owner() to return the device to kernel, the IOMMU
core will attach the default domain to the device. Unfortunately, some
IOMMU drivers don't support default domain, hence in the end, the core
calls .detach_dev instead.

This adds set_platform_dma_ops iommu ops to make it clear that what it
does is returning control back to the platform DMA ops.

Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 include/linux/iommu.h |  4 ++++
 drivers/iommu/iommu.c | 23 +++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 46e1347bfa22..7b3e3775b069 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -228,6 +228,9 @@ struct iommu_iotlb_gather {
  * @release_device: Remove device from iommu driver handling
  * @probe_finalize: Do final setup work after the device is added to an IOMMU
  *                  group and attached to the groups domain
+ * @set_platform_dma_ops: Returning control back to the platform DMA ops. This op
+ *                        is to support old IOMMU drivers, new drivers should use
+ *                        default domains, and the common IOMMU DMA ops.
  * @device_group: find iommu group for a particular device
  * @get_resv_regions: Request list of reserved regions for a device
  * @of_xlate: add OF master IDs to iommu grouping
@@ -256,6 +259,7 @@ struct iommu_ops {
 	struct iommu_device *(*probe_device)(struct device *dev);
 	void (*release_device)(struct device *dev);
 	void (*probe_finalize)(struct device *dev);
+	void (*set_platform_dma_ops)(struct device *dev);
 	struct iommu_group *(*device_group)(struct device *dev);
 
 	/* Request/Free a list of reserved regions for a device */
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index de91dd88705b..4e35a9f94873 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -2163,6 +2163,17 @@ static int iommu_group_do_detach_device(struct device *dev, void *data)
 	return 0;
 }
 
+static int iommu_group_do_set_platform_dma(struct device *dev, void *data)
+{
+	const struct iommu_ops *ops = dev_iommu_ops(dev);
+
+	if (!ops->set_platform_dma_ops)
+		return -EINVAL;
+
+	ops->set_platform_dma_ops(dev);
+	return 0;
+}
+
 static int __iommu_group_set_domain(struct iommu_group *group,
 				    struct iommu_domain *new_domain)
 {
@@ -2177,10 +2188,14 @@ static int __iommu_group_set_domain(struct iommu_group *group,
 	 * platform specific behavior.
 	 */
 	if (!new_domain) {
-		if (WARN_ON(!group->domain->ops->detach_dev))
-			return -EINVAL;
-		__iommu_group_for_each_dev(group, group->domain,
-					   iommu_group_do_detach_device);
+		ret = __iommu_group_for_each_dev(group, NULL,
+				iommu_group_do_set_platform_dma);
+		if (ret) {
+			if (WARN_ON(!group->domain->ops->detach_dev))
+				return -EINVAL;
+			__iommu_group_for_each_dev(group, group->domain,
+				iommu_group_do_detach_device);
+		}
 		group->domain = NULL;
 		return 0;
 	}
-- 
2.34.1


  parent reply	other threads:[~2023-01-04 13:07 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-04 12:57 [PATCH v4 00/19] iommu: Retire detach_dev callback Lu Baolu
2023-01-04 12:57 ` [PATCH v4 01/19] iommu/amd: Remove " Lu Baolu
2023-01-09 11:47   ` Vasant Hegde
2023-01-04 12:57 ` [PATCH v4 02/19] iommu/apple-dart: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 03/19] iommu/qcom: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 04/19] iommu/exynos: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 05/19] iommu/ipmmu: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 06/19] iommu/mtk: " Lu Baolu
2023-01-04 13:14   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 07/19] iommu/rockchip: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 08/19] iommu/sprd: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 09/19] iommu/sun50i: " Lu Baolu
2023-01-04 12:57 ` Lu Baolu [this message]
2023-01-04 13:17   ` [PATCH v4 10/19] iommu: Add set_platform_dma_ops iommu ops Jason Gunthorpe
2023-01-05  5:58     ` Baolu Lu
2023-01-05 13:15       ` Jason Gunthorpe
2023-01-06  6:07         ` Baolu Lu
2023-01-06 14:26           ` Jason Gunthorpe
2023-01-07  2:48             ` Baolu Lu
2023-01-09 12:17               ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 11/19] iommu/fsl_pamu: Add set_platform_dma_ops callback Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 12/19] iommu/msm: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 13/19] iommu/mtk_v1: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 14/19] iommu/omap: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 15/19] iommu/s390: " Lu Baolu
2023-01-04 13:20   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 16/19] iommu/gart: " Lu Baolu
2023-01-04 13:20   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 17/19] iommu/tegra: " Lu Baolu
2023-01-04 13:20   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 18/19] iommu: Remove deferred attach check from __iommu_detach_device() Lu Baolu
2023-01-04 12:57 ` [PATCH v4 19/19] iommu: Remove detach_dev callback Lu Baolu
2023-01-04 13:22   ` Jason Gunthorpe
2023-01-05  6:41     ` Baolu Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230104125725.271850-11-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=hch@infradead.org \
    --cc=heiko@sntech.de \
    --cc=iommu@lists.linux.dev \
    --cc=jean-philippe@linaro.org \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=marcan@marcan.st \
    --cc=matthias.bgg@gmail.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=orsonzhai@gmail.com \
    --cc=robdclark@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=sven@svenpeter.dev \
    --cc=thierry.reding@gmail.com \
    --cc=wens@csie.org \
    --cc=will@kernel.org \
    --cc=yong.wu@mediatek.com \
    --cc=zhang.lyra@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox