iommu/vt-d: Make intel_iommu_set_dev_pasid() to handle domain replacement

Let intel_iommu_set_dev_pasid() call the pasid replace helpers hence be
able to do domain replacement.

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241107122234.7424-8-yi.l.liu@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 103b109e23a93b1adbc5d6cf3b4e3e53924d8c7c..d19bd0ff5220feea03e3b036bdbeaa143ddb2702 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1752,10 +1752,36 @@ static void domain_context_clear_one(struct device_domain_info *info, u8 bus, u8
        intel_context_flush_present(info, context, did, true);
 }
 
+static int __domain_setup_first_level(struct intel_iommu *iommu,
+                                     struct device *dev, ioasid_t pasid,
+                                     u16 did, pgd_t *pgd, int flags,
+                                     struct iommu_domain *old)
+{
+       if (!old)
+               return intel_pasid_setup_first_level(iommu, dev, pgd,
+                                                    pasid, did, flags);
+       return intel_pasid_replace_first_level(iommu, dev, pgd, pasid, did,
+                                              iommu_domain_did(old, iommu),
+                                              flags);
+}
+
+static int domain_setup_second_level(struct intel_iommu *iommu,
+                                    struct dmar_domain *domain,
+                                    struct device *dev, ioasid_t pasid,
+                                    struct iommu_domain *old)
+{
+       if (!old)
+               return intel_pasid_setup_second_level(iommu, domain,
+                                                     dev, pasid);
+       return intel_pasid_replace_second_level(iommu, domain, dev,
+                                               iommu_domain_did(old, iommu),
+                                               pasid);
+}
+
 static int domain_setup_first_level(struct intel_iommu *iommu,
                                    struct dmar_domain *domain,
                                    struct device *dev,
-                                   u32 pasid)
+                                   u32 pasid, struct iommu_domain *old)
 {
        struct dma_pte *pgd = domain->pgd;
        int level, flags = 0;
@@ -1770,9 +1796,9 @@ static int domain_setup_first_level(struct intel_iommu *iommu,
        if (domain->force_snooping)
                flags |= PASID_FLAG_PAGE_SNOOP;
 
-       return intel_pasid_setup_first_level(iommu, dev, (pgd_t *)pgd, pasid,
-                                            domain_id_iommu(domain, iommu),
-                                            flags);
+       return __domain_setup_first_level(iommu, dev, pasid,
+                                         domain_id_iommu(domain, iommu),
+                                         (pgd_t *)pgd, flags, old);
 }
 
 static bool dev_is_real_dma_subdevice(struct device *dev)
@@ -1804,9 +1830,11 @@ static int dmar_domain_attach_device(struct dmar_domain *domain,
        if (!sm_supported(iommu))
                ret = domain_context_mapping(domain, dev);
        else if (domain->use_first_level)
-               ret = domain_setup_first_level(iommu, domain, dev, IOMMU_NO_PASID);
+               ret = domain_setup_first_level(iommu, domain, dev,
+                                              IOMMU_NO_PASID, NULL);
        else
-               ret = intel_pasid_setup_second_level(iommu, domain, dev, IOMMU_NO_PASID);
+               ret = domain_setup_second_level(iommu, domain, dev,
+                                               IOMMU_NO_PASID, NULL);
 
        if (ret)
                goto out_block_translation;
@@ -4145,10 +4173,10 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,
 
        if (dmar_domain->use_first_level)
                ret = domain_setup_first_level(iommu, dmar_domain,
-                                              dev, pasid);
+                                              dev, pasid, old);
        else
-               ret = intel_pasid_setup_second_level(iommu, dmar_domain,
-                                                    dev, pasid);
+               ret = domain_setup_second_level(iommu, dmar_domain,
+                                               dev, pasid, old);
        if (ret)
                goto out_remove_dev_pasid;