[PATCH 3.12 33/83] dmaengine: omap-dma: Fix memory leak when terminating running transfer
From: Peter Ujfalusi peter.ujfal...@ti.com
3.12-stable review patch. If anyone has any objections, please let me know.
===
commit 02d88b735f5a60f04dbf6d051b76e1877a0d0844 upstream.
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.ujfal...@ti.com
CC: linux-omap@vger.kernel.org
Signed-off-by: Vinod Koul vinod.k...@intel.com
Signed-off-by: Jiri Slaby jsl...@suse.cz
---
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 ec3fc4fd9160..b94a37630e36 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -487,6 +487,7 @@ static int omap_dma_terminate_all(struct omap_chan *c)
* 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.5
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[patch added to the 3.12 stable tree] dmaengine: omap-dma: Fix memory leak when terminating running transfer
From: Peter Ujfalusi peter.ujfal...@ti.com
This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.
===
commit 02d88b735f5a60f04dbf6d051b76e1877a0d0844 upstream.
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.ujfal...@ti.com
CC: linux-omap@vger.kernel.org
Signed-off-by: Vinod Koul vinod.k...@intel.com
Signed-off-by: Jiri Slaby jsl...@suse.cz
---
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 ec3fc4fd9160..b94a37630e36 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -487,6 +487,7 @@ static int omap_dma_terminate_all(struct omap_chan *c)
* 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.5
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: wait_for_completion_interruptible does not wait !!
On 06/20/2010 08:52 AM, Suresh Rajashekara wrote: The ioctl waits on a completion variable (using wait_for_completion_interruptible). ... I tried wait_for_completion instead, but now the kernel refuses to suspend. Do you check return value of wait_for_completion_interruptible and return its value if nonzero? We need the code to comment, otherwise it's hard to say. -- js -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: wait_for_completion_interruptible does not wait !! [During PM suspend]
On 06/20/2010 09:42 AM, Suresh Rajashekara wrote: On Sun, Jun 20, 2010 at 12:23 AM, Jiri Slaby jirisl...@gmail.com wrote: On 06/20/2010 08:52 AM, Suresh Rajashekara wrote: The ioctl waits on a completion variable (using wait_for_completion_interruptible). ... I tried wait_for_completion instead, but now the kernel refuses to suspend. Do you check return value of wait_for_completion_interruptible and return its value if nonzero? We need the code to comment, otherwise it's hard to say. No. I am not checking the return value of the wait_for_completion_interruptible. I can do it I thought so. Generally, all *_interruptible functions return a value which should be checked and propagated to upper layers. -- js -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
