2016-03-09 02:43:40

by Shawn Lin

Subject: [PATCH 2/2] mmc: dw_mmc: avoid using dmaengine_terminate_all

dmaengine_terminate_all is deprecated and should be
replaced by more explicit synchronous and asynchronous
terminate functions. This change is based on the
commit b36f09c3c441 ("dmaengine: Add transfer termination
synchronization support"). Currently dw_mci_stop_dma
may be called under the spinlock, let's migrate
dmaengine_terminate_all to async terminate. This could
avoid the race condition of use-after-free resouce of
dmaengine once slave-dma driver implement the synchronize
method.

Signed-off-by: Shawn Lin <[email protected]>
---

drivers/mmc/host/dw_mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 242f9a0..45a406f 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -680,7 +680,7 @@ static const struct dw_mci_dma_ops dw_mci_idmac_ops = {

static void dw_mci_edmac_stop_dma(struct dw_mci *host)
{
- dmaengine_terminate_all(host->dms->ch);
+ dmaengine_terminate_async(host->dms->ch);
}

static int dw_mci_edmac_start_dma(struct dw_mci *host,
--
2.3.7

2016-03-29 01:19:46

by Jaehoon Chung

Subject: Re: [PATCH 2/2] mmc: dw_mmc: avoid using dmaengine_terminate_all

Hi Shawn,

Sorry for applying late.
Applied on my repository.

Best Regards,
Jaehoon Chung

On 03/09/2016 11:34 AM, Shawn Lin wrote:
> dmaengine_terminate_all is deprecated and should be
> replaced by more explicit synchronous and asynchronous
> terminate functions. This change is based on the
> commit b36f09c3c441 ("dmaengine: Add transfer termination
> synchronization support"). Currently dw_mci_stop_dma
> may be called under the spinlock, let's migrate
> dmaengine_terminate_all to async terminate. This could
> avoid the race condition of use-after-free resouce of
> dmaengine once slave-dma driver implement the synchronize
> method.
>
> Signed-off-by: Shawn Lin <[email protected]>
> ---
>
> drivers/mmc/host/dw_mmc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 242f9a0..45a406f 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -680,7 +680,7 @@ static const struct dw_mci_dma_ops dw_mci_idmac_ops = {
>
> static void dw_mci_edmac_stop_dma(struct dw_mci *host)
> {
> - dmaengine_terminate_all(host->dms->ch);
> + dmaengine_terminate_async(host->dms->ch);
> }
>
> static int dw_mci_edmac_start_dma(struct dw_mci *host,
>