iommu/vt-d: Remove svm_dev_ops

The svm_dev_ops has never been referenced in the tree, and there's no
plan to have anything to use it. Remove it to make the code neat.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210323010600.678627-3-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 46776db47d161296dd8575f33ff2df90b3cb2bd2..933fe11797a18728434726849c76b2c1a64aece3 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -462,7 +462,6 @@ static void load_pasid(struct mm_struct *mm, u32 pasid)
 /* Caller must hold pasid_mutex, mm reference */
 static int
 intel_svm_bind_mm(struct device *dev, unsigned int flags,
-                 struct svm_dev_ops *ops,
                  struct mm_struct *mm, struct intel_svm_dev **sd)
 {
        struct intel_iommu *iommu = device_to_iommu(dev, NULL, NULL);
@@ -512,10 +511,6 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
 
                        /* Find the matching device in svm list */
                        for_each_svm_dev(sdev, svm, dev) {
-                               if (sdev->ops != ops) {
-                                       ret = -EBUSY;
-                                       goto out;
-                               }
                                sdev->users++;
                                goto success;
                        }
@@ -550,7 +545,6 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
 
        /* Finish the setup now we know we're keeping it */
        sdev->users = 1;
-       sdev->ops = ops;
        init_rcu_head(&sdev->rcu);
 
        if (!svm) {
@@ -1006,13 +1000,6 @@ invalid:
                mmap_read_unlock(svm->mm);
                mmput(svm->mm);
 bad_req:
-               WARN_ON(!sdev);
-               if (sdev && sdev->ops && sdev->ops->fault_cb) {
-                       int rwxp = (req->rd_req << 3) | (req->wr_req << 2) |
-                               (req->exe_req << 1) | (req->pm_req);
-                       sdev->ops->fault_cb(sdev->dev, req->pasid, req->addr,
-                                           req->priv_data, rwxp, result);
-               }
                /* We get here in the error case where the PASID lookup failed,
                   and these can be NULL. Do not use them below this point! */
                sdev = NULL;
@@ -1087,7 +1074,7 @@ intel_svm_bind(struct device *dev, struct mm_struct *mm, void *drvdata)
        if (drvdata)
                flags = *(unsigned int *)drvdata;
        mutex_lock(&pasid_mutex);
-       ret = intel_svm_bind_mm(dev, flags, NULL, mm, &sdev);
+       ret = intel_svm_bind_mm(dev, flags, mm, &sdev);
        if (ret)
                sva = ERR_PTR(ret);
        else if (sdev)

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 1732298ce888def6302c7f601684f1de0199987d..e0f8c2ade3e8514c25a8e292fbb0d55b08a35918 100644 (file)
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -769,14 +769,11 @@ u32 intel_svm_get_pasid(struct iommu_sva *handle);
 int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt,
                            struct iommu_page_response *msg);
 
-struct svm_dev_ops;
-
 struct intel_svm_dev {
        struct list_head list;
        struct rcu_head rcu;
        struct device *dev;
        struct intel_iommu *iommu;
-       struct svm_dev_ops *ops;
        struct iommu_sva sva;
        u32 pasid;
        int users;

diff --git a/include/linux/intel-svm.h b/include/linux/intel-svm.h
index 39d368a810b856ba19f5bc6aa2be8049c6a7acb9..6c9d10c0fb1e37471d2186898a942373e618d7b7 100644 (file)
--- a/include/linux/intel-svm.h
+++ b/include/linux/intel-svm.h
@@ -8,13 +8,6 @@
 #ifndef __INTEL_SVM_H__
 #define __INTEL_SVM_H__
 
-struct device;
-
-struct svm_dev_ops {
-       void (*fault_cb)(struct device *dev, u32 pasid, u64 address,
-                        void *private, int rwxp, int response);
-};
-
 /* Values for rxwp in fault_cb callback */
 #define SVM_REQ_READ   (1<<3)
 #define SVM_REQ_WRITE  (1<<2)