Commit f34ce7a7 authored by Baolin Wang's avatar Baolin Wang Committed by Joerg Roedel
Browse files

iommu: Add gfp parameter to io_pgtable_ops->map() 



Now the ARM page tables are always allocated by GFP_ATOMIC parameter,
but the iommu_ops->map() function has been added a gfp_t parameter by
commit 781ca2de ("iommu: Add gfp parameter to iommu_ops::map"),
thus io_pgtable_ops->map() should use the gfp parameter passed from
iommu_ops->map() to allocate page pages, which can avoid wasting the
memory allocators atomic pools for some non-atomic contexts.

Signed-off-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/3093df4cb95497aaf713fca623ce4ecebb197c2e.1591930156.git.baolin.wang@linux.alibaba.com


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

drivers/gpu/drm/panfrost/panfrost_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu, 
		while (len) {

			size_t pgsize = get_pgsize(iova | paddr, len);



			ops->map(ops, iova, paddr, pgsize, prot);

			ops->map(ops, iova, paddr, pgsize, prot, GFP_KERNEL);

			iova += pgsize;

			paddr += pgsize;

			len -= pgsize;

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2850,7 +2850,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
	if (!ops)

		return -ENODEV;



	return ops->map(ops, iova, paddr, size, prot);

	return ops->map(ops, iova, paddr, size, prot, gfp);

}



static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
		return -ENODEV;



	arm_smmu_rpm_get(smmu);

	ret = ops->map(ops, iova, paddr, size, prot);

	ret = ops->map(ops, iova, paddr, size, prot, gfp);

	arm_smmu_rpm_put(smmu);



	return ret;

drivers/iommu/io-pgtable-arm-v7s.c

+9 −9
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static arm_v7s_iopte arm_v7s_install_table(arm_v7s_iopte *table, 


static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,

			 phys_addr_t paddr, size_t size, int prot,

			 int lvl, arm_v7s_iopte *ptep)

			 int lvl, arm_v7s_iopte *ptep, gfp_t gfp)

{

	struct io_pgtable_cfg *cfg = &data->iop.cfg;

	arm_v7s_iopte pte, *cptep;
@@ -491,7 +491,7 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, 
	/* Grab a pointer to the next level */

	pte = READ_ONCE(*ptep);

	if (!pte) {

		cptep = __arm_v7s_alloc_table(lvl + 1, GFP_ATOMIC, data);

		cptep = __arm_v7s_alloc_table(lvl + 1, gfp, data);

		if (!cptep)

			return -ENOMEM;
@@ -512,11 +512,11 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, 
	}



	/* Rinse, repeat */

	return __arm_v7s_map(data, iova, paddr, size, prot, lvl + 1, cptep);

	return __arm_v7s_map(data, iova, paddr, size, prot, lvl + 1, cptep, gfp);

}



static int arm_v7s_map(struct io_pgtable_ops *ops, 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 arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);

	struct io_pgtable *iop = &data->iop;
@@ -530,7 +530,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova, 
		    paddr >= (1ULL << data->iop.cfg.oas)))

		return -ERANGE;



	ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd);

	ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);

	/*

	 * Synchronise all PTE updates for the new mapping before there's

	 * a chance for anything to kick off a table walk for the new iova.
@@ -922,12 +922,12 @@ static int __init arm_v7s_do_selftests(void) 
		if (ops->map(ops, iova, iova, size, IOMMU_READ |

						    IOMMU_WRITE |

						    IOMMU_NOEXEC |

						    IOMMU_CACHE))

						    IOMMU_CACHE, GFP_KERNEL))

			return __FAIL(ops);



		/* Overlapping mappings */

		if (!ops->map(ops, iova, iova + size, size,

			      IOMMU_READ | IOMMU_NOEXEC))

			      IOMMU_READ | IOMMU_NOEXEC, GFP_KERNEL))

			return __FAIL(ops);



		if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
@@ -946,7 +946,7 @@ static int __init arm_v7s_do_selftests(void) 
			return __FAIL(ops);



		/* Remap of partial unmap */

		if (ops->map(ops, iova_start + size, size, size, IOMMU_READ))

		if (ops->map(ops, iova_start + size, size, size, IOMMU_READ, GFP_KERNEL))

			return __FAIL(ops);



		if (ops->iova_to_phys(ops, iova_start + size + 42)
@@ -967,7 +967,7 @@ static int __init arm_v7s_do_selftests(void) 
			return __FAIL(ops);



		/* Remap full block */

		if (ops->map(ops, iova, iova, size, IOMMU_WRITE))

		if (ops->map(ops, iova, iova, size, IOMMU_WRITE, GFP_KERNEL))

			return __FAIL(ops);



		if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))

drivers/iommu/io-pgtable-arm.c

+9 −9
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static arm_lpae_iopte arm_lpae_install_table(arm_lpae_iopte *table, 


static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova,

			  phys_addr_t paddr, size_t size, arm_lpae_iopte prot,

			  int lvl, arm_lpae_iopte *ptep)

			  int lvl, arm_lpae_iopte *ptep, gfp_t gfp)

{

	arm_lpae_iopte *cptep, pte;

	size_t block_size = ARM_LPAE_BLOCK_SIZE(lvl, data);
@@ -376,7 +376,7 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, 
	/* Grab a pointer to the next level */

	pte = READ_ONCE(*ptep);

	if (!pte) {

		cptep = __arm_lpae_alloc_pages(tblsz, GFP_ATOMIC, cfg);

		cptep = __arm_lpae_alloc_pages(tblsz, gfp, cfg);

		if (!cptep)

			return -ENOMEM;
@@ -396,7 +396,7 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova, 
	}



	/* Rinse, repeat */

	return __arm_lpae_map(data, iova, paddr, size, prot, lvl + 1, cptep);

	return __arm_lpae_map(data, iova, paddr, size, prot, lvl + 1, cptep, gfp);

}



static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
@@ -461,7 +461,7 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data, 
}



static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,

			phys_addr_t paddr, size_t size, int iommu_prot)

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

{

	struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);

	struct io_pgtable_cfg *cfg = &data->iop.cfg;
@@ -483,7 +483,7 @@ static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova, 
		return -ERANGE;



	prot = arm_lpae_prot_to_pte(data, iommu_prot);

	ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep);

	ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep, gfp);

	/*

	 * Synchronise all PTE updates for the new mapping before there's

	 * a chance for anything to kick off a table walk for the new iova.
@@ -1178,12 +1178,12 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg) 
			if (ops->map(ops, iova, iova, size, IOMMU_READ |

							    IOMMU_WRITE |

							    IOMMU_NOEXEC |

							    IOMMU_CACHE))

							    IOMMU_CACHE, GFP_KERNEL))

				return __FAIL(ops, i);



			/* Overlapping mappings */

			if (!ops->map(ops, iova, iova + size, size,

				      IOMMU_READ | IOMMU_NOEXEC))

				      IOMMU_READ | IOMMU_NOEXEC, GFP_KERNEL))

				return __FAIL(ops, i);



			if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
@@ -1198,7 +1198,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg) 
			return __FAIL(ops, i);



		/* Remap of partial unmap */

		if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))

		if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ, GFP_KERNEL))

			return __FAIL(ops, i);



		if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
@@ -1216,7 +1216,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg) 
				return __FAIL(ops, i);



			/* Remap full block */

			if (ops->map(ops, iova, iova, size, IOMMU_WRITE))

			if (ops->map(ops, iova, iova, size, IOMMU_WRITE, GFP_KERNEL))

				return __FAIL(ops, i);



			if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))

CRA Git | Maintained and supported by SUSTech CRA and CCSE