mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Lorenzo Nava <lorenx4@gmail.com>
Cc: arnd@arndb.de, linux@arm.linux.org.uk,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [RFC PATCH v3] arm DMA: Fix allocation from CMA for coherent DMA
Date: Fri, 26 Jun 2015 17:25:49 +0100	[thread overview]
Message-ID: <20150626162549.GK3078@e104818-lin.cambridge.arm.com> (raw)
In-Reply-To: <1434663862-17858-1-git-send-email-lorenx4@gmail.com>

On Thu, Jun 18, 2015 at 11:44:22PM +0200, Lorenzo Nava wrote:
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 7e7583d..8e7f402 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -645,15 +645,29 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
>  	size = PAGE_ALIGN(size);
>  	want_vaddr = !dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs);
>  
> -	if (is_coherent || nommu())
> +	if (nommu()) {
>  		addr = __alloc_simple_buffer(dev, size, gfp, &page);
> -	else if (!(gfp & __GFP_WAIT))
> +		goto dma_alloc_done;
> +	}
> +
> +	if (dev_get_cma_area(dev) && (gfp & __GFP_WAIT)) {
> +		addr = __alloc_from_contiguous(dev, size, prot, &page,
> +					       caller, want_vaddr);
> +		goto dma_alloc_done;
> +	}
> +
> +	if (is_coherent) {
> +		addr = __alloc_simple_buffer(dev, size, gfp, &page);
> +		goto dma_alloc_done;
> +	}
> +
> +	if (!(gfp & __GFP_WAIT))
>  		addr = __alloc_from_pool(size, &page);
> -	else if (!dev_get_cma_area(dev))
> -		addr = __alloc_remap_buffer(dev, size, gfp, prot, &page, caller, want_vaddr);
>  	else
> -		addr = __alloc_from_contiguous(dev, size, prot, &page, caller, want_vaddr);
> +		addr = __alloc_remap_buffer(dev, size, gfp, prot, &page,
> +					    caller, want_vaddr);
>  
> +dma_alloc_done:
>  	if (page)
>  		*handle = pfn_to_dma(dev, page_to_pfn(page));

The logic here looks alright but I would have preferred the original
more concise "if ... else if" constructs than the gotos (just personal
preference).

> @@ -680,9 +694,14 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
>  static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
>  	dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
>  {
> -	pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
> +	pgprot_t prot;
>  	void *memory;
>  
> +	if (attrs == NULL)
> +		 prot  = PAGE_KERNEL;
> +	else
> +		 prot  = __get_dma_pgprot(attrs, PAGE_KERNEL);
> +
>  	if (dma_alloc_from_coherent(dev, size, handle, &memory))
>  		return memory;

I still think this is the wrong way to fix. It doesn't address the
coherent dma mmap operation. I already replied on the previous version
that we should rather have an extra argument "coherent" to
__get_dma_pgprot().

> @@ -735,12 +754,12 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
>  
>  	size = PAGE_ALIGN(size);
>  
> -	if (is_coherent || nommu()) {
> +	if (nommu()) {
>  		__dma_free_buffer(page, size);
>  	} else if (__free_from_pool(cpu_addr, size)) {
>  		return;

You have an unnecessary __free_from_pool() call here in the is_coherent
case.

>  	} else if (!dev_get_cma_area(dev)) {
> -		if (want_vaddr)
> +		if (want_vaddr && !is_coherent)
>  			__dma_free_remap(cpu_addr, size);
>  		__dma_free_buffer(page, size);
>  	} else {

-- 
Catalin

  reply	other threads:[~2015-06-26 16:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-18 21:44 Lorenzo Nava
2015-06-26 16:25 ` Catalin Marinas [this message]
2015-06-28 20:14   ` Lorenzo Nava
2015-06-29 10:37     ` Catalin Marinas
2015-06-29 10:46       ` Russell King - ARM Linux
2015-06-29 11:05         ` Catalin Marinas
2015-06-29 11:30           ` Russell King - ARM Linux

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150626162549.GK3078@e104818-lin.cambridge.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=lorenx4@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®