| Message ID | 1427456155-28990-3-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
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
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)
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(+)