Commit 65182029 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Linus Torvalds

mm/cma: remove unsupported gfp_mask parameter from cma_alloc()

cma_alloc() doesn't really support gfp flags other than __GFP_NOWARN, so
convert gfp_mask parameter to boolean no_warn parameter.

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/20180709122019eucas1p2340da484acfcc932537e6014f4fd2c29~-sqTPJKij2939229392eucas1p2j@eucas1p2.samsung.comSigned-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarMichał Nazarewicz <mina86@mina86.com>
Acked-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
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 50c150f2
...@@ -77,7 +77,7 @@ struct page *kvm_alloc_hpt_cma(unsigned long nr_pages) ...@@ -77,7 +77,7 @@ struct page *kvm_alloc_hpt_cma(unsigned long nr_pages)
VM_BUG_ON(order_base_2(nr_pages) < KVM_CMA_CHUNK_ORDER - PAGE_SHIFT); VM_BUG_ON(order_base_2(nr_pages) < KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
return cma_alloc(kvm_cma, nr_pages, order_base_2(HPT_ALIGN_PAGES), return cma_alloc(kvm_cma, nr_pages, order_base_2(HPT_ALIGN_PAGES),
GFP_KERNEL); false);
} }
EXPORT_SYMBOL_GPL(kvm_alloc_hpt_cma); EXPORT_SYMBOL_GPL(kvm_alloc_hpt_cma);
......
...@@ -68,7 +68,7 @@ static void vmcp_response_alloc(struct vmcp_session *session) ...@@ -68,7 +68,7 @@ static void vmcp_response_alloc(struct vmcp_session *session)
* anymore the system won't work anyway. * anymore the system won't work anyway.
*/ */
if (order > 2) if (order > 2)
page = cma_alloc(vmcp_cma, nr_pages, 0, GFP_KERNEL); page = cma_alloc(vmcp_cma, nr_pages, 0, false);
if (page) { if (page) {
session->response = (char *)page_to_phys(page); session->response = (char *)page_to_phys(page);
session->cma_alloc = 1; session->cma_alloc = 1;
......
...@@ -39,7 +39,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, ...@@ -39,7 +39,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
if (align > CONFIG_CMA_ALIGNMENT) if (align > CONFIG_CMA_ALIGNMENT)
align = CONFIG_CMA_ALIGNMENT; align = CONFIG_CMA_ALIGNMENT;
pages = cma_alloc(cma_heap->cma, nr_pages, align, GFP_KERNEL); pages = cma_alloc(cma_heap->cma, nr_pages, align, false);
if (!pages) if (!pages)
return -ENOMEM; return -ENOMEM;
......
...@@ -33,7 +33,7 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, ...@@ -33,7 +33,7 @@ extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
const char *name, const char *name,
struct cma **res_cma); struct cma **res_cma);
extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, extern struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
gfp_t gfp_mask); bool no_warn);
extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count);
extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data); extern int cma_for_each_area(int (*it)(struct cma *cma, void *data), void *data);
......
...@@ -191,7 +191,8 @@ struct page *dma_alloc_from_contiguous(struct device *dev, size_t count, ...@@ -191,7 +191,8 @@ struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,
if (align > CONFIG_CMA_ALIGNMENT) if (align > CONFIG_CMA_ALIGNMENT)
align = CONFIG_CMA_ALIGNMENT; align = CONFIG_CMA_ALIGNMENT;
return cma_alloc(dev_get_cma_area(dev), count, align, gfp_mask); return cma_alloc(dev_get_cma_area(dev), count, align,
gfp_mask & __GFP_NOWARN);
} }
/** /**
......
...@@ -395,13 +395,13 @@ static inline void cma_debug_show_areas(struct cma *cma) { } ...@@ -395,13 +395,13 @@ static inline void cma_debug_show_areas(struct cma *cma) { }
* @cma: Contiguous memory region for which the allocation is performed. * @cma: Contiguous memory region for which the allocation is performed.
* @count: Requested number of pages. * @count: Requested number of pages.
* @align: Requested alignment of pages (in PAGE_SIZE order). * @align: Requested alignment of pages (in PAGE_SIZE order).
* @gfp_mask: GFP mask to use during compaction * @no_warn: Avoid printing message about failed allocation
* *
* This function allocates part of contiguous memory on specific * This function allocates part of contiguous memory on specific
* contiguous memory area. * contiguous memory area.
*/ */
struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
gfp_t gfp_mask) bool no_warn)
{ {
unsigned long mask, offset; unsigned long mask, offset;
unsigned long pfn = -1; unsigned long pfn = -1;
...@@ -447,7 +447,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, ...@@ -447,7 +447,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit); pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit);
mutex_lock(&cma_mutex); mutex_lock(&cma_mutex);
ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA,
gfp_mask); GFP_KERNEL | (no_warn ? __GFP_NOWARN : 0));
mutex_unlock(&cma_mutex); mutex_unlock(&cma_mutex);
if (ret == 0) { if (ret == 0) {
page = pfn_to_page(pfn); page = pfn_to_page(pfn);
...@@ -466,7 +466,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align, ...@@ -466,7 +466,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
trace_cma_alloc(pfn, page, count, align); trace_cma_alloc(pfn, page, count, align);
if (ret && !(gfp_mask & __GFP_NOWARN)) { if (ret && !no_warn) {
pr_err("%s: alloc failed, req-size: %zu pages, ret: %d\n", pr_err("%s: alloc failed, req-size: %zu pages, ret: %d\n",
__func__, count, ret); __func__, count, ret);
cma_debug_show_areas(cma); cma_debug_show_areas(cma);
......
...@@ -139,7 +139,7 @@ static int cma_alloc_mem(struct cma *cma, int count) ...@@ -139,7 +139,7 @@ static int cma_alloc_mem(struct cma *cma, int count)
if (!mem) if (!mem)
return -ENOMEM; return -ENOMEM;
p = cma_alloc(cma, count, 0, GFP_KERNEL); p = cma_alloc(cma, count, 0, false);
if (!p) { if (!p) {
kfree(mem); kfree(mem);
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment