From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wj0-f197.google.com (mail-wj0-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 1C18C6B0253 for ; Fri, 27 Jan 2017 11:19:50 -0500 (EST) Received: by mail-wj0-f197.google.com with SMTP id c7so48063218wjb.7 for ; Fri, 27 Jan 2017 08:19:50 -0800 (PST) Received: from mx2.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id i133si3355061wme.31.2017.01.27.08.19.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 08:19:48 -0800 (PST) Date: Fri, 27 Jan 2017 17:19:46 +0100 From: Michal Hocko Subject: Re: [PATCH 2/3] mm: cma_alloc: allow to specify GFP mask Message-ID: <20170127161946.GB6357@dhcp22.suse.cz> References: <20170119170707.31741-1-l.stach@pengutronix.de> <20170119170707.31741-2-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170119170707.31741-2-l.stach@pengutronix.de> Sender: owner-linux-mm@kvack.org List-ID: To: Lucas Stach Cc: Andrew Morton , Russell King , Catalin Marinas , Will Deacon , Ralf Baechle , Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Alexander Graf , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Chris Zankel , Max Filippov , Joerg Roedel , David Woodhouse , Vlastimil Babka , linux-arm-kernel@lists.infradead.org, linux-mips@linux-mips.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-xtensa@linux-xtensa.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, kernel@pengutronix.de, patchwork-lst@pengutronix.de On Thu 19-01-17 18:07:06, Lucas Stach wrote: > Most users of this interface just want to use it with the default > GFP_KERNEL flags, but for cases where DMA memory is allocated it may > be called from a different context. > > No functional change yet, just passing through the flag to the > underlying alloc_contig_range function. > > Signed-off-by: Lucas Stach Acked-by: Michal Hocko > --- > arch/powerpc/kvm/book3s_hv_builtin.c | 3 ++- > drivers/base/dma-contiguous.c | 2 +- > include/linux/cma.h | 3 ++- > mm/cma.c | 5 +++-- > mm/cma_debug.c | 2 +- > 5 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c > index 5bb24be0b346..56a62d97ab2d 100644 > --- a/arch/powerpc/kvm/book3s_hv_builtin.c > +++ b/arch/powerpc/kvm/book3s_hv_builtin.c > @@ -56,7 +56,8 @@ struct page *kvm_alloc_hpt(unsigned long nr_pages) > { > 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); > } > EXPORT_SYMBOL_GPL(kvm_alloc_hpt); > > diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c > index e167a1e1bccb..d1a9cbabc627 100644 > --- a/drivers/base/dma-contiguous.c > +++ b/drivers/base/dma-contiguous.c > @@ -193,7 +193,7 @@ struct page *dma_alloc_from_contiguous(struct device *dev, size_t count, > if (align > CONFIG_CMA_ALIGNMENT) > align = CONFIG_CMA_ALIGNMENT; > > - return cma_alloc(dev_get_cma_area(dev), count, align); > + return cma_alloc(dev_get_cma_area(dev), count, align, GFP_KERNEL); > } > > /** > diff --git a/include/linux/cma.h b/include/linux/cma.h > index 6f0a91b37f68..03f32d0bd1d8 100644 > --- a/include/linux/cma.h > +++ b/include/linux/cma.h > @@ -29,6 +29,7 @@ extern int __init cma_declare_contiguous(phys_addr_t base, > extern int cma_init_reserved_mem(phys_addr_t base, phys_addr_t size, > unsigned int order_per_bit, > 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); > extern bool cma_release(struct cma *cma, const struct page *pages, unsigned int count); > #endif > diff --git a/mm/cma.c b/mm/cma.c > index fbd67d866f67..a33ddfde315d 100644 > --- a/mm/cma.c > +++ b/mm/cma.c > @@ -362,7 +362,8 @@ int __init cma_declare_contiguous(phys_addr_t base, > * This function allocates part of contiguous memory on specific > * 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) > { > unsigned long mask, offset; > unsigned long pfn = -1; > @@ -408,7 +409,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align) > pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit); > mutex_lock(&cma_mutex); > ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, > - GFP_KERNEL); > + gfp_mask); > mutex_unlock(&cma_mutex); > if (ret == 0) { > page = pfn_to_page(pfn); > diff --git a/mm/cma_debug.c b/mm/cma_debug.c > index f8e4b60db167..ffc0c3d0ae64 100644 > --- a/mm/cma_debug.c > +++ b/mm/cma_debug.c > @@ -138,7 +138,7 @@ static int cma_alloc_mem(struct cma *cma, int count) > if (!mem) > return -ENOMEM; > > - p = cma_alloc(cma, count, 0); > + p = cma_alloc(cma, count, 0, GFP_KERNEL); > if (!p) { > kfree(mem); > return -ENOMEM; > -- > 2.11.0 > -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org