Commit 781ca2de authored by Tom Murphy's avatar Tom Murphy Committed by Joerg Roedel
Browse files

iommu: Add gfp parameter to iommu_ops::map 

Add a gfp_t parameter to the iommu_ops::map function.
Remove the needless locking in the AMD iommu driver.

The iommu_ops::map function (or the iommu_map function which calls it)
was always supposed to be sleepable (according to Joerg's comment in
this thread: https://lore.kernel.org/patchwork/patch/977520/

 ) and so
should probably have had a "might_sleep()" since it was written. However
currently the dma-iommu api can call iommu_map in an atomic context,
which it shouldn't do. This doesn't cause any problems because any iommu
driver which uses the dma-iommu api uses gfp_atomic in it's
iommu_ops::map function. But doing this wastes the memory allocators
atomic pools.

Signed-off-by: default avatarTom Murphy <murphyt7@tcd.ie>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 37ec8eb8

drivers/iommu/amd_iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -3106,7 +3106,8 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, 
}



static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,

			 phys_addr_t paddr, size_t page_size, int iommu_prot)

			 phys_addr_t paddr, size_t page_size, int iommu_prot,

			 gfp_t gfp)

{

	struct protection_domain *domain = to_pdomain(dom);

	int prot = 0;

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2448,7 +2448,7 @@ out_unlock: 
}



static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,

			phys_addr_t paddr, size_t size, int prot)

			phys_addr_t paddr, size_t size, int prot, gfp_t gfp)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ rpm_put: 
}



static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,

			phys_addr_t paddr, size_t size, int prot)

			phys_addr_t paddr, size_t size, int prot, gfp_t gfp)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

	struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;

drivers/iommu/dma-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, 
	if (!iova)

		return DMA_MAPPING_ERROR;



	if (iommu_map(domain, iova, phys - iova_off, size, prot)) {

	if (iommu_map_atomic(domain, iova, phys - iova_off, size, prot)) {

		iommu_dma_free_iova(cookie, iova, size);

		return DMA_MAPPING_ERROR;

	}
@@ -611,7 +611,7 @@ static void *iommu_dma_alloc_remap(struct device *dev, size_t size, 
			arch_dma_prep_coherent(sg_page(sg), sg->length);

	}



	if (iommu_map_sg(domain, iova, sgt.sgl, sgt.orig_nents, ioprot)

	if (iommu_map_sg_atomic(domain, iova, sgt.sgl, sgt.orig_nents, ioprot)

			< size)

		goto out_free_sg;
@@ -871,7 +871,7 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, 
	 * We'll leave any physical concatenation to the IOMMU driver's

	 * implementation - it knows better than we do.

	 */

	if (iommu_map_sg(domain, iova, sg, nents, prot) < iova_len)

	if (iommu_map_sg_atomic(domain, iova, sg, nents, prot) < iova_len)

		goto out_free_iova;



	return __finalise_sg(dev, sg, nents, iova);

drivers/iommu/exynos-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t paddr, size_t size, 
 */

static int exynos_iommu_map(struct iommu_domain *iommu_domain,

			    unsigned long l_iova, phys_addr_t paddr, size_t size,

			    int prot)

			    int prot, gfp_t gfp)

{

	struct exynos_iommu_domain *domain = to_exynos_domain(iommu_domain);

	sysmmu_pte_t *entry;

CRA Git | Maintained and supported by SUSTech CRA and CCSE