[RFC PATCHES 2/2] iommu: Replace put_pages_list() with iommu_free_pgtbl_pages()

[Lu Baolu]

Therefore, RCU protected page free will take effect if necessary.

Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
---
 drivers/iommu/amd/io_pgtable.c | 5 ++---
 drivers/iommu/dma-iommu.c      | 6 ++++--
 drivers/iommu/intel/iommu.c    | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c
index 6608d1717574..a62d5dafd7f2 100644
--- a/drivers/iommu/amd/io_pgtable.c
+++ b/drivers/iommu/amd/io_pgtable.c
@@ -423,7 +423,7 @@ static int iommu_v1_map_page(struct io_pgtable_ops *ops, 
unsigned long iova,
        }
 
        /* Everything flushed out, free pages now */
-       put_pages_list(&freelist);
+       iommu_free_pgtbl_pages(&dom->domain, &freelist);
 
        return ret;
 }
@@ -503,8 +503,7 @@ static void v1_free_pgtable(struct io_pgtable *iop)
 
        /* Make changes visible to IOMMUs */
        amd_iommu_domain_update(dom);
-
-       put_pages_list(&freelist);
+       iommu_free_pgtbl_pages(&dom->domain, &freelist);
 }
 
 static struct io_pgtable *v1_alloc_pgtable(struct io_pgtable_cfg *cfg, void 
*cookie)
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index f90251572a5d..a948358c3e51 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -132,7 +132,8 @@ static void fq_ring_free(struct iommu_dma_cookie *cookie, 
struct iova_fq *fq)
                if (fq->entries[idx].counter >= counter)
                        break;
 
-               put_pages_list(&fq->entries[idx].freelist);
+               iommu_free_pgtbl_pages(cookie->fq_domain,
+                                      &fq->entries[idx].freelist);
                free_iova_fast(&cookie->iovad,
                               fq->entries[idx].iova_pfn,
                               fq->entries[idx].pages);
@@ -228,7 +229,8 @@ static void iommu_dma_free_fq(struct iommu_dma_cookie 
*cookie)
                struct iova_fq *fq = per_cpu_ptr(cookie->fq, cpu);
 
                fq_ring_for_each(idx, fq)
-                       put_pages_list(&fq->entries[idx].freelist);
+                       iommu_free_pgtbl_pages(cookie->fq_domain,
+                                              &fq->entries[idx].freelist);
        }
 
        free_percpu(cookie->fq);
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 19024dc52735..f429671e837f 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1891,7 +1891,7 @@ static void domain_exit(struct dmar_domain *domain)
                LIST_HEAD(freelist);
 
                domain_unmap(domain, 0, DOMAIN_MAX_PFN(domain->gaw), &freelist);
-               put_pages_list(&freelist);
+               iommu_free_pgtbl_pages(&domain->domain, &freelist);
        }
 
        kfree(domain);
@@ -4510,7 +4510,7 @@ static void intel_iommu_tlb_sync(struct iommu_domain 
*domain,
                                      start_pfn, nrpages,
                                      list_empty(&gather->freelist), 0);
 
-       put_pages_list(&gather->freelist);
+       iommu_free_pgtbl_pages(domain, &gather->freelist);
 }
 
 static phys_addr_t intel_iommu_iova_to_phys(struct iommu_domain *domain,
-- 
2.25.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu