Commit 1369459b authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu: Add a gfp parameter to iommu_map() 



The internal mechanisms support this, but instead of exposting the gfp to
the caller it wrappers it into iommu_map() and iommu_map_atomic()

Fix this instead of adding more variants for GFP_KERNEL_ACCOUNT.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/1-v3-76b587fe28df+6e3-iommu_map_gfp_jgg@nvidia.com


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

arch/arm/mm/dma-mapping.c

+7 −4
Original line number Diff line number Diff line
@@ -984,7 +984,8 @@ __iommu_create_mapping(struct device *dev, struct page **pages, size_t size, 


		len = (j - i) << PAGE_SHIFT;

		ret = iommu_map(mapping->domain, iova, phys, len,

				__dma_info_to_prot(DMA_BIDIRECTIONAL, attrs));

				__dma_info_to_prot(DMA_BIDIRECTIONAL, attrs),

				GFP_KERNEL);

		if (ret < 0)

			goto fail;

		iova += len;
@@ -1207,7 +1208,8 @@ static int __map_sg_chunk(struct device *dev, struct scatterlist *sg, 


		prot = __dma_info_to_prot(dir, attrs);



		ret = iommu_map(mapping->domain, iova, phys, len, prot);

		ret = iommu_map(mapping->domain, iova, phys, len, prot,

				GFP_KERNEL);

		if (ret < 0)

			goto fail;

		count += len >> PAGE_SHIFT;
@@ -1379,7 +1381,8 @@ static dma_addr_t arm_iommu_map_page(struct device *dev, struct page *page, 


	prot = __dma_info_to_prot(dir, attrs);



	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len, prot);

	ret = iommu_map(mapping->domain, dma_addr, page_to_phys(page), len,

			prot, GFP_KERNEL);

	if (ret < 0)

		goto fail;
@@ -1443,7 +1446,7 @@ static dma_addr_t arm_iommu_map_resource(struct device *dev, 


	prot = __dma_info_to_prot(dir, attrs) | IOMMU_MMIO;



	ret = iommu_map(mapping->domain, dma_addr, addr, len, prot);

	ret = iommu_map(mapping->domain, dma_addr, addr, len, prot, GFP_KERNEL);

	if (ret < 0)

		goto fail;

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c

+2 −1
Original line number Diff line number Diff line
@@ -475,7 +475,8 @@ gk20a_instobj_ctor_iommu(struct gk20a_instmem *imem, u32 npages, u32 align, 
		u32 offset = (r->offset + i) << imem->iommu_pgshift;



		ret = iommu_map(imem->domain, offset, node->dma_addrs[i],

				PAGE_SIZE, IOMMU_READ | IOMMU_WRITE);

				PAGE_SIZE, IOMMU_READ | IOMMU_WRITE,

				GFP_KERNEL);

		if (ret < 0) {

			nvkm_error(subdev, "IOMMU mapping failure: %d\n", ret);

drivers/gpu/drm/tegra/drm.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ void *tegra_drm_alloc(struct tegra_drm *tegra, size_t size, dma_addr_t *dma) 


	*dma = iova_dma_addr(&tegra->carveout.domain, alloc);

	err = iommu_map(tegra->domain, *dma, virt_to_phys(virt),

			size, IOMMU_READ | IOMMU_WRITE);

			size, IOMMU_READ | IOMMU_WRITE, GFP_KERNEL);

	if (err < 0)

		goto free_iova;

drivers/gpu/host1x/cdma.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int host1x_pushbuffer_init(struct push_buffer *pb) 


		pb->dma = iova_dma_addr(&host1x->iova, alloc);

		err = iommu_map(host1x->domain, pb->dma, pb->phys, size,

				IOMMU_READ);

				IOMMU_READ, GFP_KERNEL);

		if (err)

			goto iommu_free_iova;

	} else {

drivers/infiniband/hw/usnic/usnic_uiom.c

+2 −2
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

							size, flags);

						size, flags, GFP_KERNEL);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);
@@ -294,7 +294,7 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, 
				usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",

					va_start, &pa_start, size, flags);

				err = iommu_map(pd->domain, va_start, pa_start,

						size, flags);

						size, flags, GFP_KERNEL);

				if (err) {

					usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",

						va_start, &pa_start, size, err);