iommu/vt-d: Remove deferred invalidation

Deferred invalidation is an ECS specific feature. It will not be
supported when IOMMU works in scalable mode. As we deprecated the
ECS support, remove deferred invalidation and cleanup the code.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Liu Yi L <yi.l.liu@intel.com>
Cc: Sanjay Kumar <sanjay.k.kumar@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Ashok Raj <ashok.raj@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 cec88df671a65288385847cc4eb5c53a44209571..9043e1e9b2be219df691a0daeec7f4c14307e50c 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1700,7 +1700,6 @@ static void free_dmar_iommu(struct intel_iommu *iommu)
        if (pasid_supported(iommu)) {
                if (ecap_prs(iommu->ecap))
                        intel_svm_finish_prq(iommu);
-               intel_svm_exit(iommu);
        }
 #endif
 }

diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index 04d6bdb5140488c897db0038e64506358a183a4f..5b2e3b2d593b8425b01a5a8693f2ff3e39c8afb6 100644 (file)
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -31,15 +31,8 @@
 
 static irqreturn_t prq_event_thread(int irq, void *d);
 
-struct pasid_state_entry {
-       u64 val;
-};
-
 int intel_svm_init(struct intel_iommu *iommu)
 {
-       struct page *pages;
-       int order;
-
        if (cpu_feature_enabled(X86_FEATURE_GBPAGES) &&
                        !cap_fl1gp_support(iommu->cap))
                return -EINVAL;
@@ -48,39 +41,6 @@ int intel_svm_init(struct intel_iommu *iommu)
                        !cap_5lp_support(iommu->cap))
                return -EINVAL;
 
-       /* Start at 2 because it's defined as 2^(1+PSS) */
-       iommu->pasid_max = 2 << ecap_pss(iommu->ecap);
-
-       /* Eventually I'm promised we will get a multi-level PASID table
-        * and it won't have to be physically contiguous. Until then,
-        * limit the size because 8MiB contiguous allocations can be hard
-        * to come by. The limit of 0x20000, which is 1MiB for each of
-        * the PASID and PASID-state tables, is somewhat arbitrary. */
-       if (iommu->pasid_max > 0x20000)
-               iommu->pasid_max = 0x20000;
-
-       order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
-       if (ecap_dis(iommu->ecap)) {
-               pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
-               if (pages)
-                       iommu->pasid_state_table = page_address(pages);
-               else
-                       pr_warn("IOMMU: %s: Failed to allocate PASID state table\n",
-                               iommu->name);
-       }
-
-       return 0;
-}
-
-int intel_svm_exit(struct intel_iommu *iommu)
-{
-       int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max);
-
-       if (iommu->pasid_state_table) {
-               free_pages((unsigned long)iommu->pasid_state_table, order);
-               iommu->pasid_state_table = NULL;
-       }
-
        return 0;
 }
 
@@ -214,11 +174,6 @@ static void intel_flush_svm_range(struct intel_svm *svm, unsigned long address,
 {
        struct intel_svm_dev *sdev;
 
-       /* Try deferred invalidate if available */
-       if (svm->iommu->pasid_state_table &&
-           !cmpxchg64(&svm->iommu->pasid_state_table[svm->pasid].val, 0, 1ULL << 63))
-               return;
-
        rcu_read_lock();
        list_for_each_entry_rcu(sdev, &svm->devs, list)
                intel_flush_svm_range_dev(svm, sdev, address, pages, ih, gl);

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index cfcf9c1e187283a052274dfe95c0365e18ce23a4..0605f3bf6e79808b2e814496b4f135fc82771a21 100644 (file)
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -541,15 +541,8 @@ struct intel_iommu {
        struct iommu_flush flush;
 #endif
 #ifdef CONFIG_INTEL_IOMMU_SVM
-       /* These are large and need to be contiguous, so we allocate just
-        * one for now. We'll maybe want to rethink that if we truly give
-        * devices away to userspace processes (e.g. for DPDK) and don't
-        * want to trust that userspace will use *only* the PASID it was
-        * told to. But while it's all driver-arbitrated, we're fine. */
-       struct pasid_state_entry *pasid_state_table;
        struct page_req_dsc *prq;
        unsigned char prq_name[16];    /* Name for PRQ interrupt */
-       u32 pasid_max;
 #endif
        struct q_inval  *qi;            /* Queued invalidation info */
        u32 *iommu_state; /* Store iommu states between suspend and resume.*/
@@ -663,7 +656,6 @@ void iommu_flush_write_buffer(struct intel_iommu *iommu);
 
 #ifdef CONFIG_INTEL_IOMMU_SVM
 int intel_svm_init(struct intel_iommu *iommu);
-int intel_svm_exit(struct intel_iommu *iommu);
 extern int intel_svm_enable_prq(struct intel_iommu *iommu);
 extern int intel_svm_finish_prq(struct intel_iommu *iommu);