From: Vinod Koul <vinod.koul@intel.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: linux@arm.linux.org.uk, dan.j.williams@intel.com,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 2/5] dmaengine: omap-dma: Fix memory leak when terminating running transfer
Date: Mon, 30 Mar 2015 23:18:45 +0530 [thread overview]
Message-ID: <20150330174845.GM7192@intel.com> (raw)
In-Reply-To: <1427456155-28990-3-git-send-email-peter.ujfalusi@ti.com>
On Fri, Mar 27, 2015 at 01:35:52PM +0200, Peter Ujfalusi wrote:
> In omap_dma_start_desc the vdesc->node is removed from the virt-dma
> framework managed lists (to be precise from the desc_issued list).
> If a terminate_all comes before the transfer finishes the omap_desc will
> not be freed up because it is not in any of the lists and we stopped the
> DMA channel so the transfer will not going to complete.
> There is no special sequence for leaking memory when using cyclic (audio)
> transfer: with every start and stop of a cyclic transfer the driver leaks
> struct omap_desc worth of memory.
>
> Free up the allocated memory directly in omap_dma_terminate_all() since the
> framework will not going to do that for us.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> CC: <stable@vger.kernel.org>
> CC: <linux-omap@vger.kernel.org>
Applied, thanks
--
~Vinod
> ---
> drivers/dma/omap-dma.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
> index 1e646d6c8230..6a4c378ee432 100644
> --- a/drivers/dma/omap-dma.c
> +++ b/drivers/dma/omap-dma.c
> @@ -1002,6 +1002,7 @@ static int omap_dma_terminate_all(struct dma_chan *chan)
> * c->desc is NULL and exit.)
> */
> if (c->desc) {
> + omap_dma_desc_free(&c->desc->vd);
> c->desc = NULL;
> /* Avoid stopping the dma twice */
> if (!c->paused)
> --
> 2.3.3
>
--
prev parent reply other threads:[~2015-03-30 17:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1427456155-28990-1-git-send-email-peter.ujfalusi@ti.com>
2015-03-27 11:35 ` [PATCH 1/5] dmaengine: edma: fix memory leak when terminating running transfers Peter Ujfalusi
2015-03-30 17:48 ` Vinod Koul
2015-03-27 11:35 ` [PATCH 2/5] dmaengine: omap-dma: Fix memory leak when terminating running transfer Peter Ujfalusi
2015-03-30 17:48 ` Vinod Koul [this message]
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=20150330174845.GM7192@intel.com \
--to=vinod.koul@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=peter.ujfalusi@ti.com \
--cc=stable@vger.kernel.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).