Skip to content

Commit f34ce7a

Browse files
Baolin Wangjoergroedel
Baolin Wang
authored and
joergroedel
committed
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 781ca2d ("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: Baolin Wang <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/3093df4cb95497aaf713fca623ce4ecebb197c2e.1591930156.git.baolin.wang@linux.alibaba.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent 9930264 commit f34ce7a

File tree

10 files changed

+26
-26
lines changed

10 files changed

+26
-26
lines changed

‎drivers/gpu/drm/panfrost/panfrost_mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu,
262262
while (len) {
263263
size_t pgsize = get_pgsize(iova | paddr, len);
264264

265-
ops->map(ops, iova, paddr, pgsize, prot);
265+
ops->map(ops, iova, paddr, pgsize, prot, GFP_KERNEL);
266266
iova += pgsize;
267267
paddr += pgsize;
268268
len -= pgsize;

‎drivers/iommu/arm-smmu-v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
28502850
if (!ops)
28512851
return -ENODEV;
28522852

2853-
return ops->map(ops, iova, paddr, size, prot);
2853+
return ops->map(ops, iova, paddr, size, prot, gfp);
28542854
}
28552855

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

‎drivers/iommu/arm-smmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
12271227
return -ENODEV;
12281228

12291229
arm_smmu_rpm_get(smmu);
1230-
ret = ops->map(ops, iova, paddr, size, prot);
1230+
ret = ops->map(ops, iova, paddr, size, prot, gfp);
12311231
arm_smmu_rpm_put(smmu);
12321232

12331233
return ret;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static arm_v7s_iopte arm_v7s_install_table(arm_v7s_iopte *table,
470470

471471
static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,
472472
phys_addr_t paddr, size_t size, int prot,
473-
int lvl, arm_v7s_iopte *ptep)
473+
int lvl, arm_v7s_iopte *ptep, gfp_t gfp)
474474
{
475475
struct io_pgtable_cfg *cfg = &data->iop.cfg;
476476
arm_v7s_iopte pte, *cptep;
@@ -491,7 +491,7 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,
491491
/* Grab a pointer to the next level */
492492
pte = READ_ONCE(*ptep);
493493
if (!pte) {
494-
cptep = __arm_v7s_alloc_table(lvl + 1, GFP_ATOMIC, data);
494+
cptep = __arm_v7s_alloc_table(lvl + 1, gfp, data);
495495
if (!cptep)
496496
return -ENOMEM;
497497

@@ -512,11 +512,11 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,
512512
}
513513

514514
/* Rinse, repeat */
515-
return __arm_v7s_map(data, iova, paddr, size, prot, lvl + 1, cptep);
515+
return __arm_v7s_map(data, iova, paddr, size, prot, lvl + 1, cptep, gfp);
516516
}
517517

518518
static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
519-
phys_addr_t paddr, size_t size, int prot)
519+
phys_addr_t paddr, size_t size, int prot, gfp_t gfp)
520520
{
521521
struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops);
522522
struct io_pgtable *iop = &data->iop;
@@ -530,7 +530,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova,
530530
paddr >= (1ULL << data->iop.cfg.oas)))
531531
return -ERANGE;
532532

533-
ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd);
533+
ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp);
534534
/*
535535
* Synchronise all PTE updates for the new mapping before there's
536536
* 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)
922922
if (ops->map(ops, iova, iova, size, IOMMU_READ |
923923
IOMMU_WRITE |
924924
IOMMU_NOEXEC |
925-
IOMMU_CACHE))
925+
IOMMU_CACHE, GFP_KERNEL))
926926
return __FAIL(ops);
927927

928928
/* Overlapping mappings */
929929
if (!ops->map(ops, iova, iova + size, size,
930-
IOMMU_READ | IOMMU_NOEXEC))
930+
IOMMU_READ | IOMMU_NOEXEC, GFP_KERNEL))
931931
return __FAIL(ops);
932932

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

948948
/* Remap of partial unmap */
949-
if (ops->map(ops, iova_start + size, size, size, IOMMU_READ))
949+
if (ops->map(ops, iova_start + size, size, size, IOMMU_READ, GFP_KERNEL))
950950
return __FAIL(ops);
951951

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

969969
/* Remap full block */
970-
if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
970+
if (ops->map(ops, iova, iova, size, IOMMU_WRITE, GFP_KERNEL))
971971
return __FAIL(ops);
972972

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static arm_lpae_iopte arm_lpae_install_table(arm_lpae_iopte *table,
355355

356356
static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova,
357357
phys_addr_t paddr, size_t size, arm_lpae_iopte prot,
358-
int lvl, arm_lpae_iopte *ptep)
358+
int lvl, arm_lpae_iopte *ptep, gfp_t gfp)
359359
{
360360
arm_lpae_iopte *cptep, pte;
361361
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,
376376
/* Grab a pointer to the next level */
377377
pte = READ_ONCE(*ptep);
378378
if (!pte) {
379-
cptep = __arm_lpae_alloc_pages(tblsz, GFP_ATOMIC, cfg);
379+
cptep = __arm_lpae_alloc_pages(tblsz, gfp, cfg);
380380
if (!cptep)
381381
return -ENOMEM;
382382

@@ -396,7 +396,7 @@ static int __arm_lpae_map(struct arm_lpae_io_pgtable *data, unsigned long iova,
396396
}
397397

398398
/* Rinse, repeat */
399-
return __arm_lpae_map(data, iova, paddr, size, prot, lvl + 1, cptep);
399+
return __arm_lpae_map(data, iova, paddr, size, prot, lvl + 1, cptep, gfp);
400400
}
401401

402402
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,
461461
}
462462

463463
static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
464-
phys_addr_t paddr, size_t size, int iommu_prot)
464+
phys_addr_t paddr, size_t size, int iommu_prot, gfp_t gfp)
465465
{
466466
struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
467467
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,
483483
return -ERANGE;
484484

485485
prot = arm_lpae_prot_to_pte(data, iommu_prot);
486-
ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep);
486+
ret = __arm_lpae_map(data, iova, paddr, size, prot, lvl, ptep, gfp);
487487
/*
488488
* Synchronise all PTE updates for the new mapping before there's
489489
* 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)
11781178
if (ops->map(ops, iova, iova, size, IOMMU_READ |
11791179
IOMMU_WRITE |
11801180
IOMMU_NOEXEC |
1181-
IOMMU_CACHE))
1181+
IOMMU_CACHE, GFP_KERNEL))
11821182
return __FAIL(ops, i);
11831183

11841184
/* Overlapping mappings */
11851185
if (!ops->map(ops, iova, iova + size, size,
1186-
IOMMU_READ | IOMMU_NOEXEC))
1186+
IOMMU_READ | IOMMU_NOEXEC, GFP_KERNEL))
11871187
return __FAIL(ops, i);
11881188

11891189
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)
11981198
return __FAIL(ops, i);
11991199

12001200
/* Remap of partial unmap */
1201-
if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
1201+
if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ, GFP_KERNEL))
12021202
return __FAIL(ops, i);
12031203

12041204
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)
12161216
return __FAIL(ops, i);
12171217

12181218
/* Remap full block */
1219-
if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
1219+
if (ops->map(ops, iova, iova, size, IOMMU_WRITE, GFP_KERNEL))
12201220
return __FAIL(ops, i);
12211221

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

‎drivers/iommu/ipmmu-vmsa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
687687
if (!domain)
688688
return -ENODEV;
689689

690-
return domain->iop->map(domain->iop, iova, paddr, size, prot);
690+
return domain->iop->map(domain->iop, iova, paddr, size, prot, gfp);
691691
}
692692

693693
static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,

‎drivers/iommu/msm_iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long iova,
491491
int ret;
492492

493493
spin_lock_irqsave(&priv->pgtlock, flags);
494-
ret = priv->iop->map(priv->iop, iova, pa, len, prot);
494+
ret = priv->iop->map(priv->iop, iova, pa, len, prot, GFP_ATOMIC);
495495
spin_unlock_irqrestore(&priv->pgtlock, flags);
496496

497497
return ret;

‎drivers/iommu/mtk_iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,
397397
paddr |= BIT_ULL(32);
398398

399399
/* Synchronize with the tlb_lock */
400-
return dom->iop->map(dom->iop, iova, paddr, size, prot);
400+
return dom->iop->map(dom->iop, iova, paddr, size, prot, gfp);
401401
}
402402

403403
static size_t mtk_iommu_unmap(struct iommu_domain *domain,

‎drivers/iommu/qcom_iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static int qcom_iommu_map(struct iommu_domain *domain, unsigned long iova,
441441
return -ENODEV;
442442

443443
spin_lock_irqsave(&qcom_domain->pgtbl_lock, flags);
444-
ret = ops->map(ops, iova, paddr, size, prot);
444+
ret = ops->map(ops, iova, paddr, size, prot, GFP_ATOMIC);
445445
spin_unlock_irqrestore(&qcom_domain->pgtbl_lock, flags);
446446
return ret;
447447
}

‎include/linux/io-pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ struct io_pgtable_cfg {
155155
*/
156156
struct io_pgtable_ops {
157157
int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
158-
phys_addr_t paddr, size_t size, int prot);
158+
phys_addr_t paddr, size_t size, int prot, gfp_t gfp);
159159
size_t (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
160160
size_t size, struct iommu_iotlb_gather *gather);
161161
phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,

0 commit comments

Comments
 (0)