From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: Use and error-check DMA_ERROR_CODE
Date: Wed, 1 Oct 2014 11:13:23 +0100 [thread overview]
Message-ID: <20141001101323.GB2587@arm.com> (raw)
In-Reply-To: <1412108121-19262-1-git-send-email-seanpaul@chromium.org>
Hi Sean,
On Tue, Sep 30, 2014 at 09:15:21PM +0100, Sean Paul wrote:
> This patch replaces the static assignment of ~0 to dma_handle with
> DMA_ERROR_CODE to be consistent with other platforms.
>
> In addition to that, it also adds a check for DMA_ERROR_CODE before
> calling __dma_free_coherent with an invalid dma_handle.
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> arch/arm64/mm/dma-mapping.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
> index 4164c5a..69fd2c4 100644
> --- a/arch/arm64/mm/dma-mapping.c
> +++ b/arch/arm64/mm/dma-mapping.c
> @@ -125,7 +125,7 @@ static void *__dma_alloc_noncoherent(struct device *dev, size_t size,
> no_map:
> __dma_free_coherent(dev, size, ptr, *dma_handle, attrs);
> no_mem:
> - *dma_handle = ~0;
> + *dma_handle = DMA_ERROR_CODE;
> return NULL;
> }
>
> @@ -136,7 +136,9 @@ static void __dma_free_noncoherent(struct device *dev, size_t size,
> void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle));
>
> vunmap(vaddr);
> - __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs);
> +
> + if (dma_handle != DMA_ERROR_CODE)
> + __dma_free_coherent(dev, size, swiotlb_addr, dma_handle, attrs);
Is it legal to try and free a DMA buffer after a failed allocation? If so, I
think we need something similar for arch/arm/.
Will
next prev parent reply other threads:[~2014-10-01 10:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 20:15 [PATCH] arm64: Use and error-check DMA_ERROR_CODE Sean Paul
2014-10-01 10:13 ` Will Deacon [this message]
2014-10-01 10:56 ` Catalin Marinas
2014-10-01 13:52 ` Russell King - ARM Linux
2014-10-01 15:31 ` [PATCH v2] arm64: Use DMA_ERROR_CODE to denote failed allocation Sean Paul
2014-10-02 10:57 ` Catalin Marinas
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=20141001101323.GB2587@arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).