1 files changed, 9 insertions, 52 deletions

diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index bea878f8e7d3..90f70d0e1141 100644
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -92,13 +92,6 @@ static spinlock_t state_lock;
 
 static struct workqueue_struct *iommu_wq;
 
-/*
- * Empty page table - Used between
- * mmu_notifier_invalidate_range_start and
- * mmu_notifier_invalidate_range_end
- */
-static u64 *empty_page_table;
-
 static void free_pasid_states(struct device_state *dev_state);
 
 static u16 device_id(struct pci_dev *pdev)
@@ -414,46 +407,21 @@ static void mn_invalidate_page(struct mmu_notifier *mn,
         __mn_flush_page(mn, address);
 }
 
-static void mn_invalidate_range_start(struct mmu_notifier *mn,
-                                      struct mm_struct *mm,
-                                      unsigned long start, unsigned long end)
-{
-        struct pasid_state *pasid_state;
-        struct device_state *dev_state;
-        unsigned long flags;
-
-        pasid_state = mn_to_state(mn);
-        dev_state   = pasid_state->device_state;
-
-        spin_lock_irqsave(&pasid_state->lock, flags);
-        if (pasid_state->mmu_notifier_count == 0) {
-                amd_iommu_domain_set_gcr3(dev_state->domain,
-                                          pasid_state->pasid,
-                                          __pa(empty_page_table));
-        }
-        pasid_state->mmu_notifier_count += 1;
-        spin_unlock_irqrestore(&pasid_state->lock, flags);
-}
-
-static void mn_invalidate_range_end(struct mmu_notifier *mn,
-                                    struct mm_struct *mm,
-                                    unsigned long start, unsigned long end)
+static void mn_invalidate_range(struct mmu_notifier *mn,
+                                struct mm_struct *mm,
+                                unsigned long start, unsigned long end)
 {
         struct pasid_state *pasid_state;
         struct device_state *dev_state;
-        unsigned long flags;
 
         pasid_state = mn_to_state(mn);
         dev_state   = pasid_state->device_state;
 
-        spin_lock_irqsave(&pasid_state->lock, flags);
-        pasid_state->mmu_notifier_count -= 1;
-        if (pasid_state->mmu_notifier_count == 0) {
-                amd_iommu_domain_set_gcr3(dev_state->domain,
-                                          pasid_state->pasid,
-                                          __pa(pasid_state->mm->pgd));
-        }
-        spin_unlock_irqrestore(&pasid_state->lock, flags);
+        if ((start ^ (end - 1)) < PAGE_SIZE)
+                amd_iommu_flush_page(dev_state->domain, pasid_state->pasid,
+                                     start);
+        else
+                amd_iommu_flush_tlb(dev_state->domain, pasid_state->pasid);
 }
 
 static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm)
@@ -478,8 +446,7 @@ static struct mmu_notifier_ops iommu_mn = {
         .release                = mn_release,
         .clear_flush_young      = mn_clear_flush_young,
         .invalidate_page        = mn_invalidate_page,
-        .invalidate_range_start = mn_invalidate_range_start,
-        .invalidate_range_end   = mn_invalidate_range_end,
+        .invalidate_range       = mn_invalidate_range,
 };
 
 static void set_pri_tag_status(struct pasid_state *pasid_state,
@@ -972,18 +939,10 @@ static int __init amd_iommu_v2_init(void)
         if (iommu_wq == NULL)
                 goto out;
 
-        ret = -ENOMEM;
-        empty_page_table = (u64 *)get_zeroed_page(GFP_KERNEL);
-        if (empty_page_table == NULL)
-                goto out_destroy_wq;
-
         amd_iommu_register_ppr_notifier(&ppr_nb);
 
         return 0;
 
-out_destroy_wq:
-        destroy_workqueue(iommu_wq);
-
 out:
         return ret;
 }
@@ -1017,8 +976,6 @@ static void __exit amd_iommu_v2_exit(void)
         }
 
         destroy_workqueue(iommu_wq);
-
-        free_page((unsigned long)empty_page_table);
 }
 
 module_init(amd_iommu_v2_init);