iommu/vt-d: Remove sva from intel_svm_dev

After commit be51b1d6bbff ("iommu/sva: Refactoring
iommu_sva_bind/unbind_device()"), the iommu driver doesn't need to
return an iommu_sva pointer anymore. This removes the sva field
from intel_svm_dev and cleanups the code accordingly.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20230109014955.147068-5-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 2a1619ff0d798f118eff6365f3110e40e459fb77..f0222ad3875719a51d940c92de8b81b12d963302 100644 (file)
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -761,7 +761,6 @@ struct intel_svm_dev {
        struct rcu_head rcu;
        struct device *dev;
        struct intel_iommu *iommu;
-       struct iommu_sva sva;
        u16 did;
        u16 sid, qdep;
 };

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index c7dc53e40c26c490001aa7e942b37635857d3877..e7b9bedebcc077cf9a48e8b51033908cf2ee694b 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -298,9 +298,8 @@ out:
        return 0;
 }
 
-static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
-                                          struct device *dev,
-                                          struct mm_struct *mm)
+static int intel_svm_bind_mm(struct intel_iommu *iommu, struct device *dev,
+                            struct mm_struct *mm)
 {
        struct device_domain_info *info = dev_iommu_priv_get(dev);
        struct intel_svm_dev *sdev;
@@ -312,7 +311,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
        if (!svm) {
                svm = kzalloc(sizeof(*svm), GFP_KERNEL);
                if (!svm)
-                       return ERR_PTR(-ENOMEM);
+                       return -ENOMEM;
 
                svm->pasid = mm->pasid;
                svm->mm = mm;
@@ -322,14 +321,14 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
                ret = mmu_notifier_register(&svm->notifier, mm);
                if (ret) {
                        kfree(svm);
-                       return ERR_PTR(ret);
+                       return ret;
                }
 
                ret = pasid_private_add(svm->pasid, svm);
                if (ret) {
                        mmu_notifier_unregister(&svm->notifier, mm);
                        kfree(svm);
-                       return ERR_PTR(ret);
+                       return ret;
                }
        }
 
@@ -343,7 +342,6 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
        sdev->iommu = iommu;
        sdev->did = FLPT_DEFAULT_DID;
        sdev->sid = PCI_DEVID(info->bus, info->devfn);
-       sdev->sva.dev = dev;
        init_rcu_head(&sdev->rcu);
        if (info->ats_enabled) {
                sdev->qdep = info->ats_qdep;
@@ -360,7 +358,7 @@ static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
 
        list_add_rcu(&sdev->list, &svm->devs);
 
-       return &sdev->sva;
+       return 0;
 
 free_sdev:
        kfree(sdev);
@@ -371,7 +369,7 @@ free_svm:
                kfree(svm);
        }
 
-       return ERR_PTR(ret);
+       return ret;
 }
 
 /* Caller must hold pasid_mutex */
@@ -843,13 +841,10 @@ static int intel_svm_set_dev_pasid(struct iommu_domain *domain,
        struct device_domain_info *info = dev_iommu_priv_get(dev);
        struct intel_iommu *iommu = info->iommu;
        struct mm_struct *mm = domain->mm;
-       struct iommu_sva *sva;
-       int ret = 0;
+       int ret;
 
        mutex_lock(&pasid_mutex);
-       sva = intel_svm_bind_mm(iommu, dev, mm);
-       if (IS_ERR(sva))
-               ret = PTR_ERR(sva);
+       ret = intel_svm_bind_mm(iommu, dev, mm);
        mutex_unlock(&pasid_mutex);
 
        return ret;