Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d834c5ab authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Linus Torvalds
Browse files

kernel/dma: remove unsupported gfp_mask parameter from dma_alloc_from_contiguous() 

The CMA memory allocator doesn't support standard gfp flags for memory
allocation, so there is no point having it as a parameter for
dma_alloc_from_contiguous() function.  Replace it by a boolean no_warn
argument, which covers all the underlaying cma_alloc() function
supports.

This will help to avoid giving false feeling that this function supports
standard gfp flags and callers can pass __GFP_ZERO to get zeroed buffer,
what has already been an issue: see commit dd65a941 ("arm64:
dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag").

Link: http://lkml.kernel.org/r/20180709122020eucas1p21a71b092975cb4a3b9954ffc63f699d1~-sqUFoa-h2939329393eucas1p2Y@eucas1p2.samsung.com


Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarMichał Nazarewicz <mina86@mina86.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 65182029

arch/arm/mm/dma-mapping.c

+3 −2
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static void *__alloc_from_contiguous(struct device *dev, size_t size, 
	struct page *page;

	void *ptr = NULL;



	page = dma_alloc_from_contiguous(dev, count, order, gfp);

	page = dma_alloc_from_contiguous(dev, count, order, gfp & __GFP_NOWARN);

	if (!page)

		return NULL;
@@ -1299,7 +1299,8 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
		unsigned long order = get_order(size);

		struct page *page;



		page = dma_alloc_from_contiguous(dev, count, order, gfp);

		page = dma_alloc_from_contiguous(dev, count, order,

						 gfp & __GFP_NOWARN);

		if (!page)

			goto error;

arch/arm64/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int __init atomic_pool_init(void) 


	if (dev_get_cma_area(NULL))

		page = dma_alloc_from_contiguous(NULL, nr_pages,

						 pool_size_order, GFP_KERNEL);

						 pool_size_order, false);

	else

		page = alloc_pages(GFP_DMA32, pool_size_order);
@@ -573,7 +573,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, 
		struct page *page;



		page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,

						 get_order(size), gfp);

					get_order(size), gfp & __GFP_NOWARN);

		if (!page)

			return NULL;

arch/xtensa/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size, 


	if (gfpflags_allow_blocking(flag))

		page = dma_alloc_from_contiguous(dev, count, get_order(size),

						 flag);

						 flag & __GFP_NOWARN);



	if (!page)

		page = alloc_pages(flag, get_order(size));

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -2620,7 +2620,7 @@ static void *alloc_coherent(struct device *dev, size_t size, 
			return NULL;



		page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,

						 get_order(size), flag);

					get_order(size), flag & __GFP_NOWARN);

		if (!page)

			return NULL;

	}

drivers/iommu/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -3758,7 +3758,8 @@ static void *intel_alloc_coherent(struct device *dev, size_t size, 
	if (gfpflags_allow_blocking(flags)) {

		unsigned int count = size >> PAGE_SHIFT;



		page = dma_alloc_from_contiguous(dev, count, order, flags);

		page = dma_alloc_from_contiguous(dev, count, order,

						 flags & __GFP_NOWARN);

		if (page && iommu_no_mapping(dev) &&

		    page_to_phys(page) + size > dev->coherent_dma_mask) {

			dma_release_from_contiguous(dev, page, count);