Commit 3e8e986c authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu/pages: Remove iommu_free_page() 



Use iommu_free_pages() instead.

Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarMostafa Saleh <smostafa@google.com>
Tested-by: default avatarAlejandro Jimenez <alejandro.j.jimenez@oracle.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/6-v4-c8663abbb606+3f7-iommu_pages_jgg@nvidia.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 4316ba4a

drivers/iommu/amd/init.c

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ static int __init alloc_cwwb_sem(struct amd_iommu *iommu) 
static void __init free_cwwb_sem(struct amd_iommu *iommu)

{

	if (iommu->cmd_sem)

		iommu_free_page((void *)iommu->cmd_sem);

		iommu_free_pages((void *)iommu->cmd_sem);

}



static void iommu_enable_xt(struct amd_iommu *iommu)

drivers/iommu/amd/io_pgtable.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static bool increase_address_space(struct amd_io_pgtable *pgtable, 


out:

	spin_unlock_irqrestore(&domain->lock, flags);

	iommu_free_page(pte);

	iommu_free_pages(pte);



	return ret;

}
@@ -222,7 +222,7 @@ static u64 *alloc_pte(struct amd_io_pgtable *pgtable, 


			/* pte could have been changed somewhere. */

			if (!try_cmpxchg64(pte, &__pte, __npte))

				iommu_free_page(page);

				iommu_free_pages(page);

			else if (IOMMU_PTE_PRESENT(__pte))

				*updated = true;

drivers/iommu/amd/io_pgtable_v2.c

+4 −4
Original line number Diff line number Diff line
@@ -121,10 +121,10 @@ static void free_pgtable(u64 *pt, int level) 
		if (level > 2)

			free_pgtable(p, level - 1);

		else

			iommu_free_page(p);

			iommu_free_pages(p);

	}



	iommu_free_page(pt);

	iommu_free_pages(pt);

}



/* Allocate page table */
@@ -159,7 +159,7 @@ static u64 *v2_alloc_pte(int nid, u64 *pgd, unsigned long iova, 
			__npte = set_pgtable_attr(page);

			/* pte could have been changed somewhere. */

			if (!try_cmpxchg64(pte, &__pte, __npte))

				iommu_free_page(page);

				iommu_free_pages(page);

			else if (IOMMU_PTE_PRESENT(__pte))

				*updated = true;
@@ -181,7 +181,7 @@ static u64 *v2_alloc_pte(int nid, u64 *pgd, unsigned long iova, 
		if (pg_size == IOMMU_PAGE_SIZE_1G)

			free_pgtable(__pte, end_level - 1);

		else if (pg_size == IOMMU_PAGE_SIZE_2M)

			iommu_free_page(__pte);

			iommu_free_pages(__pte);

	}



	return pte;

drivers/iommu/amd/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ static void free_gcr3_tbl_level1(u64 *tbl) 


		ptr = iommu_phys_to_virt(tbl[i] & PAGE_MASK);



		iommu_free_page(ptr);

		iommu_free_pages(ptr);

	}

}
@@ -1845,7 +1845,7 @@ static void free_gcr3_table(struct gcr3_tbl_info *gcr3_info) 
	/* Free per device domain ID */

	pdom_id_free(gcr3_info->domid);



	iommu_free_page(gcr3_info->gcr3_tbl);

	iommu_free_pages(gcr3_info->gcr3_tbl);

	gcr3_info->gcr3_tbl = NULL;

}

drivers/iommu/intel/dmar.c

+2 −2
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ static void free_iommu(struct intel_iommu *iommu) 
	}



	if (iommu->qi) {

		iommu_free_page(iommu->qi->desc);

		iommu_free_pages(iommu->qi->desc);

		kfree(iommu->qi->desc_status);

		kfree(iommu->qi);

	}
@@ -1714,7 +1714,7 @@ int dmar_enable_qi(struct intel_iommu *iommu) 


	qi->desc_status = kcalloc(QI_LENGTH, sizeof(int), GFP_ATOMIC);

	if (!qi->desc_status) {

		iommu_free_page(qi->desc);

		iommu_free_pages(qi->desc);

		kfree(qi);

		iommu->qi = NULL;

		return -ENOMEM;