iommu: Refactoring domain allocation interface

Commit <17de3f5fdd35> ("iommu: Retire bus ops") removes iommu ops from bus. The iommu subsystem no longer relies on bus for operations. So the bus parameter in iommu_domain_alloc() is no longer relevant.

Add a new interface named iommu_paging_domain_alloc(), which explicitly indicates the allocation of a paging domain for DMA managed by a kernel driver. The new interface takes a device pointer as its parameter, that better aligns with the current iommu subsystem.

Signed-off-by Lu Baolu <[email protected]>

---
 include/linux/iommu.h |  6 ++++++
 drivers/iommu/iommu.c | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

Commit <17de3f5fdd35> ("iommu: Retire bus ops") removes iommu ops from bus. The iommu subsystem no longer relies on bus for operations. So the bus parameter in iommu_domain_alloc() is no longer relevant.

Add a new interface named iommu_paging_domain_alloc(), which explicitly indicates the allocation of a paging domain for DMA managed by a kernel driver. The new interface takes a device pointer as its parameter, that better aligns with the current iommu subsystem.

Signed-off-by Lu Baolu <[email protected]>

---
 include/linux/iommu.h |  6 ++++++
 drivers/iommu/iommu.c | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

include/linux/iommu.h +6 -0

index 7bc8dff7cf6d..46f1348f1f0a 100644
@@ -780,6 +780,7 @@ extern bool iommu_present(const struct bus_type *bus);
 extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
 extern bool iommu_group_has_isolated_msi(struct iommu_group *group);
 extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);
+struct iommu_domain *iommu_paging_domain_alloc(struct device *dev);
 extern void iommu_domain_free(struct iommu_domain *domain);
 extern int iommu_attach_device(struct iommu_domain *domain,
 			       struct device *dev);

@@ -1086,6 +1087,11 @@ static inline struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus
 	return NULL;
 }
 
+static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)
+{
+	return ERR_PTR(-ENODEV);
+}
+
 static inline void iommu_domain_free(struct iommu_domain *domain)
 {
 }

drivers/iommu/iommu.c +20 -0

index 9df7cc75c1bc..e03c71a34347 100644
@@ -2016,6 +2016,10 @@ static int __iommu_domain_alloc_dev(struct device *dev, void *data)
 	return 0;
 }
 
+/*
+ * The iommu ops in bus has been retired. Do not use this interface in
+ * new drivers.
+ */
 struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus)
 {
 	const struct iommu_ops *ops = NULL;

@@ -2032,6 +2036,22 @@ struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus)
 }
 EXPORT_SYMBOL_GPL(iommu_domain_alloc);
 
+/**
+ * iommu_paging_domain_alloc() - Allocate a paging domain
+ * @dev: device for which the domain is allocated
+ *
+ * Allocate a paging domain which will be managed by a kernel driver. Return
+ * allocated domain if successful, or a ERR pointer for failure.
+ */
+struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)
+{
+	if (!dev_has_iommu(dev))
+		return ERR_PTR(-ENODEV);
+
+	return __iommu_domain_alloc(dev_iommu_ops(dev), dev, IOMMU_DOMAIN_UNMANAGED);
+}
+EXPORT_SYMBOL_GPL(iommu_paging_domain_alloc);
+
 void iommu_domain_free(struct iommu_domain *domain)
 {
 	if (domain->type == IOMMU_DOMAIN_SVA)

If the iommu driver doesn't implement its domain_alloc_user callback, iommufd_hwpt_paging_alloc() rolls back to allocate an iommu paging domain. Replace iommu_domain_alloc() with iommu_user_domain_alloc() to pass the device pointer along the path.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/iommu/iommufd/hw_pagetable.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Replace iommu_domain_alloc() with iommu_paging_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/vfio/vfio_iommu_type1.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Replace iommu_domain_alloc() with iommu_paging_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/vhost/vdpa.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Replace iommu_domain_alloc() with iommu_paging_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/vhost/vdpa.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

drivers/vhost/vdpa.c +6 -8

index 63a53680a85c..e31ec9ebc4ce 100644
@@ -1312,26 +1312,24 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdpa *v)
 	struct vdpa_device *vdpa = v->vdpa;
 	const struct vdpa_config_ops *ops = vdpa->config;
 	struct device *dma_dev = vdpa_get_dma_dev(vdpa);
-	const struct bus_type *bus;
 	int ret;
 
 	/* Device want to do DMA by itself */
 	if (ops->set_map || ops->dma_map)
 		return 0;
 
-	bus = dma_dev->bus;
-	if (!bus)
-		return -EFAULT;
-
 	if (!device_iommu_capable(dma_dev, IOMMU_CAP_CACHE_COHERENCY)) {
 		dev_warn_once(&v->dev,
 			      "Failed to allocate domain, device is not IOMMU cache coherent capable\n");
 		return -ENOTSUPP;
 	}
 
-	v->domain = iommu_domain_alloc(bus);
-	if (!v->domain)
-		return -EIO;
+	v->domain = iommu_paging_domain_alloc(dma_dev);
+	if (IS_ERR(v->domain)) {
+		ret = PTR_ERR(v->domain);
+		v->domain = NULL;
+		return ret;
+	}
 
 	ret = iommu_attach_device(v->domain, dma_dev);
 	if (ret)

Signature · 1 line

2.34.1

Quoted 3 lines · Lu Baolu

Replace iommu_domain_alloc() with iommu_paging_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

Acked-by Michael S. Tsirkin <[email protected]>

I assume it's merged with the rest of the stuff, right?

An iommu domain is allocated in host1x_iommu_attach() and is attached to host->dev. Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/gpu/host1x/dev.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

An iommu domain is allocated in tegra_vde_iommu_init() and is attached to vde->dev. Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/media/platform/nvidia/tegra-vde/iommu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 

An iommu domain is allocated in venus_firmware_init() and is attached to core->fw.dev in the same function. Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/media/platform/qcom/venus/firmware.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

An iommu domain is allocated in ath10k_fw_init() and is attached to ar_snoc->fw.dev in the same function. Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

Acked-by Jeff Johnson <[email protected]>

---
 drivers/net/wireless/ath/ath10k/snoc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

An iommu domain is allocated in ath11k_ahb_fw_resources_init() and is attached to ab_ahb->fw.dev in the same function.

Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

Acked-by Jeff Johnson <[email protected]>

---
 drivers/net/wireless/ath/ath11k/ahb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

An iommu domain is allocated in rproc_enable_iommu() and is attached to rproc->dev.parent in the same function.

Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/remoteproc/remoteproc_core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

An iommu domain is allocated in portal_set_cpu() and is attached to pcfg->dev in the same function.

Use iommu_paging_domain_alloc() to make it explicit.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/soc/fsl/qbman/qman_portal.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

The domain_alloc_user operation is currently implemented by allocating a paging domain using iommu_domain_alloc(). This is because it needs to fully initialize the domain before return. Add a helper to do this to avoid using iommu_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/iommu/intel/iommu.c | 87 +++++++++++++++++++++++++++++++++----
 1 file changed, 78 insertions(+), 9 deletions(-)

drivers/iommu/intel/iommu.c +18 -0

index 2e9811bf2a4e..ccde5f5972e4 100644
@@ -3633,6 +3633,79 @@ static struct iommu_domain blocking_domain = {
 	}
 };
 
+static int iommu_superpage_capability(struct intel_iommu *iommu, bool first_stage)
+{
+	if (!intel_iommu_superpage)
+		return 0;
+
+	if (first_stage)
+		return cap_fl1gp_support(iommu->cap) ? 2 : 1;
+
+	return fls(cap_super_page_val(iommu->cap));
+}
+
+static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_stage)
+{
+	struct device_domain_info *info = dev_iommu_priv_get(dev);
+	struct intel_iommu *iommu = info->iommu;
+	struct dmar_domain *domain;
+	int addr_width;
+

drivers/iommu/intel/iommu.c +9 -0

+	domain->nid = dev_to_node(dev);
+	domain->has_iotlb_device = info->ats_enabled;
+	domain->use_first_level = first_stage;
+
+	/* calculate the address width */
+	addr_width = agaw_to_width(iommu->agaw);
+	if (addr_width > cap_mgaw(iommu->cap))
+		addr_width = cap_mgaw(iommu->cap);
+	domain->gaw = addr_width;

Quoted 9 lines · Lu Baolu

The domain_alloc_user operation is currently implemented by allocating a paging domain using iommu_domain_alloc(). This is because it needs to fully initialize the domain before return. Add a helper to do this to avoid using iommu_domain_alloc().

Signed-off-by Lu Baolu<[email protected]>

---
  drivers/iommu/intel/iommu.c | 87 +++++++++++++++++++++++++++++++++----
  1 file changed, 78 insertions(+), 9 deletions(-)

It seems Ok, but I have some small thoughts

Reviewed-by Jason Gunthorpe<[email protected]>

Quoted 26 lines

drivers/iommu/intel/iommu.c +18 -0

index 2e9811bf2a4e..ccde5f5972e4 100644
@@ -3633,6 +3633,79 @@ static struct iommu_domain blocking_domain = {
  	}
  };
 
+static int iommu_superpage_capability(struct intel_iommu *iommu, bool first_stage)
+{
+	if (!intel_iommu_superpage)
+		return 0;
+
+	if (first_stage)
+		return cap_fl1gp_support(iommu->cap) ? 2 : 1;
+
+	return fls(cap_super_page_val(iommu->cap));
+}
+
+static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_stage)
+{
+	struct device_domain_info *info = dev_iommu_priv_get(dev);
+	struct intel_iommu *iommu = info->iommu;
+	struct dmar_domain *domain;
+	int addr_width;
+

drivers/iommu/intel/iommu.c static struct iommu_domain blocking_domain = { · line 3663

Quoted 10 lines

drivers/iommu/intel/iommu.c +10 -0

+	domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+	if (!domain)
+		return ERR_PTR(-ENOMEM);
+
+	INIT_LIST_HEAD(&domain->devices);
+	INIT_LIST_HEAD(&domain->dev_pasids);
+	INIT_LIST_HEAD(&domain->cache_tags);
+	spin_lock_init(&domain->lock);
+	spin_lock_init(&domain->cache_lock);
+	xa_init(&domain->iommu_array);

You should probably split more, with an 'alloc struct dmar_domain' function that can be used by SVA and others too.

Quoted 13 lines

drivers/iommu/intel/iommu.c +13 -0

+	domain->nid = dev_to_node(dev);
+	domain->has_iotlb_device = info->ats_enabled;
+	domain->use_first_level = first_stage;
+
+	/* calculate the address width */
+	addr_width = agaw_to_width(iommu->agaw);
+	if (addr_width > cap_mgaw(iommu->cap))
+		addr_width = cap_mgaw(iommu->cap);
+	domain->gaw = addr_width;
+	domain->agaw = iommu->agaw;
+	domain->max_addr = __DOMAIN_MAX_ADDR(addr_width);
+
+	/* iommu memory access coherency */

drivers/iommu/intel/iommu.c static struct iommu_domain blocking_domain = { · line 3683

Quoted 6 lines

drivers/iommu/intel/iommu.c +6 -0

+	domain->iommu_coherency = iommu_paging_structure_coherency(iommu);
+
+	/* pagesize bitmap */
+	domain->domain.pgsize_bitmap = SZ_4K;
+	domain->iommu_superpage = iommu_superpage_capability(iommu, first_stage);
+	domain->domain.pgsize_bitmap |= domain_super_pgsize_bitmap(domain);

Then some of this stuff is really just paging only. Like SVA/identity/etc don't have pgszie and other things.

The domain_alloc_user operation is currently implemented by allocating a paging domain using iommu_domain_alloc(). This is because it needs to fully initialize the domain before return. Add a helper to do this to avoid using iommu_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
  drivers/iommu/intel/iommu.c | 87 +++++++++++++++++++++++++++++++++----
  1 file changed, 78 insertions(+), 9 deletions(-)

drivers/iommu/intel/iommu.c +73 -1

index 2e9811bf2a4e..ccde5f5972e4 100644
@@ -3633,6 +3633,79 @@ static struct iommu_domain blocking_domain = {
  	}
  };
 
+static int iommu_superpage_capability(struct intel_iommu *iommu, bool first_stage)
+{
+	if (!intel_iommu_superpage)
+		return 0;
+
+	if (first_stage)
+		return cap_fl1gp_support(iommu->cap) ? 2 : 1;
+
+	return fls(cap_super_page_val(iommu->cap));
+}
+
+static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_stage)
+{
+	struct device_domain_info *info = dev_iommu_priv_get(dev);
+	struct intel_iommu *iommu = info->iommu;
+	struct dmar_domain *domain;
+	int addr_width;
+
+	domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+	if (!domain)
+		return ERR_PTR(-ENOMEM);
+
+	INIT_LIST_HEAD(&domain->devices);
+	INIT_LIST_HEAD(&domain->dev_pasids);
+	INIT_LIST_HEAD(&domain->cache_tags);
+	spin_lock_init(&domain->lock);
+	spin_lock_init(&domain->cache_lock);
+	xa_init(&domain->iommu_array);
+
+	domain->nid = dev_to_node(dev);
+	domain->has_iotlb_device = info->ats_enabled;
+	domain->use_first_level = first_stage;
+
+	/* calculate the address width */
+	addr_width = agaw_to_width(iommu->agaw);
+	if (addr_width > cap_mgaw(iommu->cap))
+		addr_width = cap_mgaw(iommu->cap);
+	domain->gaw = addr_width;
+	domain->agaw = iommu->agaw;
+	domain->max_addr = __DOMAIN_MAX_ADDR(addr_width);
+
+	/* iommu memory access coherency */
+	domain->iommu_coherency = iommu_paging_structure_coherency(iommu);
+
+	/* pagesize bitmap */
+	domain->domain.pgsize_bitmap = SZ_4K;
+	domain->iommu_superpage = iommu_superpage_capability(iommu, first_stage);
+	domain->domain.pgsize_bitmap |= domain_super_pgsize_bitmap(domain);
+
+	/*
+	 * IOVA aperture: First-level translation restricts the input-address
+	 * to a canonical address (i.e., address bits 63:N have the same value
+	 * as address bit [N-1], where N is 48-bits with 4-level paging and
+	 * 57-bits with 5-level paging). Hence, skip bit [N-1].
+	 */
+	domain->domain.geometry.force_aperture = true;
+	domain->domain.geometry.aperture_start = 0;
+	if (first_stage)
+		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);
+	else
+		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);
+
+	/* always allocate the top pgd */
+	domain->pgd = iommu_alloc_page_node(domain->nid, GFP_KERNEL);
+	if (!domain->pgd) {
+		kfree(domain);
+		return ERR_PTR(-ENOMEM);
+	}
+	domain_flush_cache(domain, domain->pgd, PAGE_SIZE);
+
+	return domain;
+}
+
  static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
  {
  	struct dmar_domain *dmar_domain;

@@ -3695,15 +3768,11 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags,
  	if (user_data || (dirty_tracking && !ssads_supported(iommu)))
  		return ERR_PTR(-EOPNOTSUPP);
 
-	/*

drivers/iommu/intel/iommu.c +3 -0

+	if (IS_ERR(dmar_domain))
+		return ERR_CAST(dmar_domain);
+	domain = &dmar_domain->domain;
 
  	if (nested_parent) {
  		dmar_domain->nested_parent = true;

Quoted 110 lines · Lu Baolu

The domain_alloc_user operation is currently implemented by allocating a paging domain using iommu_domain_alloc(). This is because it needs to fully initialize the domain before return. Add a helper to do this to avoid using iommu_domain_alloc().

Signed-off-by Lu Baolu <[email protected]>

---
  drivers/iommu/intel/iommu.c | 87 +++++++++++++++++++++++++++++++++----

  1 file changed, 78 insertions(+), 9 deletions(-)

drivers/iommu/intel/iommu.c +51 -0

index 2e9811bf2a4e..ccde5f5972e4 100644
@@ -3633,6 +3633,79 @@ static struct iommu_domain blocking_domain = {
       }
   };
+static int iommu_superpage_capability(struct intel_iommu *iommu, bool 
 first_stage)
+{
+    if (!intel_iommu_superpage)
+        return 0;
+
+    if (first_stage)
+        return cap_fl1gp_support(iommu->cap) ? 2 : 1;
+
+    return fls(cap_super_page_val(iommu->cap));
+}
+
+static struct dmar_domain *paging_domain_alloc(struct device *dev, 
 bool first_stage)
+{
+    struct device_domain_info *info = dev_iommu_priv_get(dev);
+    struct intel_iommu *iommu = info->iommu;
+    struct dmar_domain *domain;
+    int addr_width;
+
+    domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+    if (!domain)
+        return ERR_PTR(-ENOMEM);
+
+    INIT_LIST_HEAD(&domain->devices);
+    INIT_LIST_HEAD(&domain->dev_pasids);
+    INIT_LIST_HEAD(&domain->cache_tags);
+    spin_lock_init(&domain->lock);
+    spin_lock_init(&domain->cache_lock);
+    xa_init(&domain->iommu_array);
+
+    domain->nid = dev_to_node(dev);
+    domain->has_iotlb_device = info->ats_enabled;
+    domain->use_first_level = first_stage;
+
+    /* calculate the address width */
+    addr_width = agaw_to_width(iommu->agaw);
+    if (addr_width > cap_mgaw(iommu->cap))
+        addr_width = cap_mgaw(iommu->cap);
+    domain->gaw = addr_width;
+    domain->agaw = iommu->agaw;
+    domain->max_addr = __DOMAIN_MAX_ADDR(addr_width);
+
+    /* iommu memory access coherency */
+    domain->iommu_coherency = iommu_paging_structure_coherency(iommu);
+
+    /* pagesize bitmap */
+    domain->domain.pgsize_bitmap = SZ_4K;
+    domain->iommu_superpage = iommu_superpage_capability(iommu, 
 first_stage);
+    domain->domain.pgsize_bitmap |= domain_super_pgsize_bitmap(domain);
+
+    /*
+     * IOVA aperture: First-level translation restricts the 

input-address
+     * to a canonical address (i.e., address bits 63:N have the same value
+     * as address bit [N-1], where N is 48-bits with 4-level paging and +     * 57-bits with 5-level paging). Hence, skip bit [N-1]. +     */
+    domain->domain.geometry.force_aperture = true;
+    domain->domain.geometry.aperture_start = 0;
+    if (first_stage)
+        domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);
+    else
+        domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);

drivers/iommu/intel/iommu.c +12 -0

+
+    /* always allocate the top pgd */
+    domain->pgd = iommu_alloc_page_node(domain->nid, GFP_KERNEL);
+    if (!domain->pgd) {
+        kfree(domain);
+        return ERR_PTR(-ENOMEM);
+    }
+    domain_flush_cache(domain, domain->pgd, PAGE_SIZE);
+
+    return domain;
+}
+

  static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) {
      struct dmar_domain *dmar_domain;

drivers/iommu/intel/iommu.c +0 -6

@@ -3695,15 +3768,11 @@ intel_iommu_domain_alloc_user(struct device 
 *dev, u32 flags,
       if (user_data || (dirty_tracking && !ssads_supported(iommu)))
           return ERR_PTR(-EOPNOTSUPP);
-    /*
-     * domain_alloc_user op needs to fully initialize a domain before
-     * return, so uses iommu_domain_alloc() here for simple.
-     */
-    domain = iommu_domain_alloc(dev->bus);
-    if (!domain)

drivers/iommu/intel/iommu.c intel_iommu_domain_alloc_user(struct device · line 3772

Quoted 5 lines

drivers/iommu/intel/iommu.c +2 -3

-        return ERR_PTR(-ENOMEM);
-
-    dmar_domain = to_dmar_domain(domain);
+    /* Do not use first stage for user domain translation. */
+    dmar_domain = paging_domain_alloc(dev, false);

this is not an apple-to-apple replacement yet. You need to set the type, owner and domain->ops as well.

Since arm_iommu_create_mapping() now accepts the device, let's replace iommu_domain_alloc() with iommu_paging_domain_alloc() to retire the former.

Signed-off-by Lu Baolu <[email protected]>

---
 arch/arm/mm/dma-mapping.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Commit <421be3ee36a4> ("drm/rockchip: Refactor IOMMU initialisation") has refactored rockchip_drm_init_iommu() to pass a device that the domain is allocated for. Replace iommu_domain_alloc() with iommu_paging_domain_alloc() to retire the former.

Signed-off-by Lu Baolu <[email protected]>

---
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

The iommu_present() interface is no longer used in the tree anymore. Remove it to avoid dead code.

Signed-off-by Lu Baolu <[email protected]>

---
 include/linux/iommu.h |  6 ------
 drivers/iommu/iommu.c | 25 -------------------------
 2 files changed, 31 deletions(-)

The iommu_domain_alloc() interface is no longer used in the tree anymore. Remove it to avoid dead code.

There is increasing demand for supporting multiple IOMMU drivers, and this is the last bus-based thing standing in the way of that.

Signed-off-by Lu Baolu <[email protected]>

---
 include/linux/iommu.h |  6 ------
 drivers/iommu/iommu.c | 36 ------------------------------------
 2 files changed, 42 deletions(-)

Lu Baolu (20):
iommu: Add iommu_paging_domain_alloc() interface
iommufd: Use iommu_paging_domain_alloc() vfio/type1: Use iommu_paging_domain_alloc() drm/msm: Use iommu_paging_domain_alloc()
wifi: ath10k: Use iommu_paging_domain_alloc()
wifi: ath11k: Use iommu_paging_domain_alloc() RDMA/usnic: Use iommu_paging_domain_alloc()

The IOMMU subsystem has undergone some changes, including the removal of iommu_ops from the bus structure. Consequently, the existing domain allocation interface, which relies on a bus type argument, is no longer relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

[...]

Quoted 8 lines · Lu Baolu

The IOMMU subsystem has undergone some changes, including the removal of iommu_ops from the bus structure. Consequently, the existing domain allocation interface, which relies on a bus type argument, is no longer relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

[...]

Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks!

[01/21] iommu: Add iommu_paging_domain_alloc() interface

         https://git.kernel.org/iommu/c/a27bf2743cb8
[02/21] iommufd: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/26a581606fab
[03/21] vfio/type1: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/60ffc4501722
[04/21] vhost-vdpa: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/9c159f6de1ae
[05/21] drm/msm: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/45acf35af200

[10/21] wifi: ath10k: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/d5b7485588df
[11/21] wifi: ath11k: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/ef50d41fbf1c

[14/21] RDMA/usnic: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/3b10f25704be
[15/21] iommu/vt-d: Add helper to allocate paging domain
         https://git.kernel.org/iommu/c/9e9ba576c259

Quoted 27 lines · Will Deacon

Quoted 8 lines · Lu Baolu

The IOMMU subsystem has undergone some changes, including the removal of iommu_ops from the bus structure. Consequently, the existing domain allocation interface, which relies on a bus type argument, is no longer relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

[...]

Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks!

[01/21] iommu: Add iommu_paging_domain_alloc() interface

         https://git.kernel.org/iommu/c/a27bf2743cb8
[02/21] iommufd: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/26a581606fab
[03/21] vfio/type1: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/60ffc4501722
[04/21] vhost-vdpa: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/9c159f6de1ae
[05/21] drm/msm: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/45acf35af200

[10/21] wifi: ath10k: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/d5b7485588df
[11/21] wifi: ath11k: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/ef50d41fbf1c

Quoted 4 lines

[14/21] RDMA/usnic: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/3b10f25704be
[15/21] iommu/vt-d: Add helper to allocate paging domain
         https://git.kernel.org/iommu/c/9e9ba576c259

Will, the patch [15/21] has already been included in my VT-d update pull request. I have also addressed Yi's comment in that patch. So can you please remove it from this branch?

Quoted 8 lines · Lu Baolu

The IOMMU subsystem has undergone some changes, including the removal of iommu_ops from the bus structure. Consequently, the existing domain allocation interface, which relies on a bus type argument, is no longer relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

[...]

Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks!

[01/21] iommu: Add iommu_paging_domain_alloc() interface

        https://git.kernel.org/iommu/c/a27bf2743cb8
[02/21] iommufd: Use iommu_paging_domain_alloc()
        https://git.kernel.org/iommu/c/26a581606fab
[03/21] vfio/type1: Use iommu_paging_domain_alloc()
        https://git.kernel.org/iommu/c/60ffc4501722
[04/21] vhost-vdpa: Use iommu_paging_domain_alloc()
        https://git.kernel.org/iommu/c/9c159f6de1ae
[05/21] drm/msm: Use iommu_paging_domain_alloc()
        https://git.kernel.org/iommu/c/45acf35af200

[10/21] wifi: ath10k: Use iommu_paging_domain_alloc()

        https://git.kernel.org/iommu/c/d5b7485588df
[11/21] wifi: ath11k: Use iommu_paging_domain_alloc()
        https://git.kernel.org/iommu/c/ef50d41fbf1c

[14/21] RDMA/usnic: Use iommu_paging_domain_alloc()

        https://git.kernel.org/iommu/c/3b10f25704be
[15/21] iommu/vt-d: Add helper to allocate paging domain
        https://git.kernel.org/iommu/c/9e9ba576c259

Quoted 27 lines · Will Deacon

Quoted 8 lines · Lu Baolu

The IOMMU subsystem has undergone some changes, including the removal of iommu_ops from the bus structure. Consequently, the existing domain allocation interface, which relies on a bus type argument, is no longer relevant:

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

[...]

Applied a few of these to iommu (iommufd/paging-domain-alloc), thanks!

[01/21] iommu: Add iommu_paging_domain_alloc() interface

         https://git.kernel.org/iommu/c/a27bf2743cb8
[02/21] iommufd: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/26a581606fab
[03/21] vfio/type1: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/60ffc4501722
[04/21] vhost-vdpa: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/9c159f6de1ae
[05/21] drm/msm: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/45acf35af200

[10/21] wifi: ath10k: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/d5b7485588df
[11/21] wifi: ath11k: Use iommu_paging_domain_alloc()
         https://git.kernel.org/iommu/c/ef50d41fbf1c

Quoted 4 lines

[14/21] RDMA/usnic: Use iommu_paging_domain_alloc()

         https://git.kernel.org/iommu/c/3b10f25704be
[15/21] iommu/vt-d: Add helper to allocate paging domain
         https://git.kernel.org/iommu/c/9e9ba576c259

Great, Lu can you please split the remaining by subsystem and try to get them to go through subsystem trees? Joerg can take the leftovers at rc6/7 or something like that so we can finish this.

I think this is enough that Intel and AMD could now assert that dev is non-null?