iommu/vt-d: Make intel_svm_set_dev_pasid() support domain replacement

Make intel_svm_set_dev_pasid() support replacement.

Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241107122234.7424-10-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 f3ccbe516dcbb74f3bfbbd40b1da5d5dcad35f8c..251cfebe6226399fb060597bcc480b52027a8e79 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1752,10 +1752,10 @@ 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)
+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,

diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index cdca7d5061a7ee87a3c0543316873c0f9fa66b37..d23977cc7d90629f2058a67479dbd7ada044e590 100644 (file)
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -1250,6 +1250,11 @@ domain_add_dev_pasid(struct iommu_domain *domain,
 void domain_remove_dev_pasid(struct iommu_domain *domain,
                             struct device *dev, ioasid_t pasid);
 
+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);
+
 int dmar_ir_support(void);
 
 void iommu_flush_write_buffer(struct intel_iommu *iommu);

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 6c0685ea8466ed02b7979770c54672bb1de1ff6c..f5569347591f268fd383fc39f786de31be2d29f3 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -127,8 +127,9 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain,
 
        /* Setup the pasid table: */
        sflags = cpu_feature_enabled(X86_FEATURE_LA57) ? PASID_FLAG_FL5LP : 0;
-       ret = intel_pasid_setup_first_level(iommu, dev, mm->pgd, pasid,
-                                           FLPT_DEFAULT_DID, sflags);
+       ret = __domain_setup_first_level(iommu, dev, pasid,
+                                        FLPT_DEFAULT_DID, mm->pgd,
+                                        sflags, old);
        if (ret)
                goto out_remove_dev_pasid;