diff options
| author | Tom Murphy <murphyt7@tcd.ie> | 2019-09-08 09:56:38 -0700 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-10-15 11:31:04 +0200 |
| commit | 781ca2de89bae1b1d2c96df9ef33e9a324415995 (patch) | |
| tree | 04157d331dc84fe18b642feb29addc62942cee06 /drivers/iommu/ipmmu-vmsa.c | |
| parent | 37ec8eb851c1876580a963f283fe7496592b9f72 (diff) | |
| download | linux-stable-781ca2de89bae1b1d2c96df9ef33e9a324415995.tar.gz linux-stable-781ca2de89bae1b1d2c96df9ef33e9a324415995.tar.bz2 linux-stable-781ca2de89bae1b1d2c96df9ef33e9a324415995.zip | |
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: Tom Murphy <murphyt7@tcd.ie>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/ipmmu-vmsa.c')
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 9da8309f7170..35f3edaba0e2 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -724,7 +724,7 @@ static void ipmmu_detach_device(struct iommu_domain *io_domain, } static int ipmmu_map(struct iommu_domain *io_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 ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain); |