mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <vinod.koul@intel.com>, <linux@arm.linux.org.uk>
Cc: <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: [PATCH 2/5] dmaengine: omap-dma: Fix memory leak when terminating running transfer
Date: Fri, 27 Mar 2015 13:35:52 +0200	[thread overview]
Message-ID: <1427456155-28990-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1427456155-28990-1-git-send-email-peter.ujfalusi@ti.com>

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>
---
 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


  parent reply	other threads:[~2015-03-27 11:36 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-27 11:35 [PATCH 0/5] dmaengine: Fix memory leak amongs virt-dma users Peter Ujfalusi
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 ` Peter Ujfalusi [this message]
2015-03-30 17:48   ` [PATCH 2/5] dmaengine: omap-dma: Fix memory leak when terminating running transfer Vinod Koul
2015-03-27 11:35 ` [PATCH 3/5] dmaengine: bcm2835-dma: Fix memory leak when stopping a " Peter Ujfalusi
2015-03-28  3:57   ` Stephen Warren
2015-03-28 21:50     ` Peter Ujfalusi
2015-03-30 17:48   ` Vinod Koul
2015-03-27 11:35 ` [PATCH 4/5] dmaengine: hsu: " Peter Ujfalusi
2015-03-27 12:01   ` Andy Shevchenko
2015-03-30 17:37     ` Vinod Koul
2015-04-28 11:17       ` 'Greg Kroah-Hartman'
2015-05-04 11:04         ` Vinod Koul
2015-05-07 16:26   ` Andy Shevchenko
2015-03-27 11:35 ` [PATCH 5/5] dmaengine: moxart-dma: " Peter Ujfalusi
2015-03-30 17:49   ` Vinod Koul

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=1427456155-28990-3-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.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=stable@vger.kernel.org \
    --cc=vinod.koul@intel.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®