linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer
       [not found] ` <1427456155-28990-5-git-send-email-peter.ujfalusi@ti.com>
@ 2015-03-27 12:01   ` Andy Shevchenko
  2015-03-30 17:37     ` Vinod Koul
  0 siblings, 1 reply; 4+ messages in thread
From: Andy Shevchenko @ 2015-03-27 12:01 UTC (permalink / raw)
  To: Peter Ujfalusi, 'Greg Kroah-Hartman',
	linux-serial@vger.kernel.org
  Cc: vinod.koul, linux, dan.j.williams, dmaengine, linux-kernel,
	linux-arm-kernel

On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
> The vd->node is removed from the lists when the transfer started so the
> vchan_get_all_descriptors() will not find it. This results memory leak.
> 

Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Though this one would go via Greg's tty tree (Cc'ed) I think.
It becomes to regular work flow after 4.1-rc1.


> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> ---
>  drivers/dma/hsu/hsu.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
> index 683ba9b62795..d1864bda008f 100644
> --- a/drivers/dma/hsu/hsu.c
> +++ b/drivers/dma/hsu/hsu.c
> @@ -387,7 +387,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
>  	spin_lock_irqsave(&hsuc->vchan.lock, flags);
>  
>  	hsu_dma_stop_channel(hsuc);
> -	hsuc->desc = NULL;
> +	if (hsuc->desc) {
> +		hsu_dma_desc_free(&hsuc->desc->vchan);
> +		hsuc->desc = NULL;
> +	}
>  
>  	vchan_get_all_descriptors(&hsuc->vchan, &head);
>  	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);


-- 
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer
  2015-03-27 12:01   ` [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer Andy Shevchenko
@ 2015-03-30 17:37     ` Vinod Koul
  2015-04-28 11:17       ` 'Greg Kroah-Hartman'
  0 siblings, 1 reply; 4+ messages in thread
From: Vinod Koul @ 2015-03-30 17:37 UTC (permalink / raw)
  To: 'Greg Kroah-Hartman'
  Cc: Peter Ujfalusi, Andy Shevchenko, linux-serial@vger.kernel.org,
	linux, dan.j.williams, dmaengine, linux-kernel, linux-arm-kernel

On Fri, Mar 27, 2015 at 02:01:58PM +0200, Andy Shevchenko wrote:
> On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
> > The vd->node is removed from the lists when the transfer started so the
> > vchan_get_all_descriptors() will not find it. This results memory leak.
> > 
> 
> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>

Greg,

Please apply this in your queue for next

-- 
Vinod

> 
> Though this one would go via Greg's tty tree (Cc'ed) I think.
> It becomes to regular work flow after 4.1-rc1.
> 
> 
> > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> > CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> > ---
> >  drivers/dma/hsu/hsu.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
> > index 683ba9b62795..d1864bda008f 100644
> > --- a/drivers/dma/hsu/hsu.c
> > +++ b/drivers/dma/hsu/hsu.c
> > @@ -387,7 +387,10 @@ static int hsu_dma_terminate_all(struct dma_chan *chan)
> >  	spin_lock_irqsave(&hsuc->vchan.lock, flags);
> >  
> >  	hsu_dma_stop_channel(hsuc);
> > -	hsuc->desc = NULL;
> > +	if (hsuc->desc) {
> > +		hsu_dma_desc_free(&hsuc->desc->vchan);
> > +		hsuc->desc = NULL;
> > +	}
> >  
> >  	vchan_get_all_descriptors(&hsuc->vchan, &head);
> >  	spin_unlock_irqrestore(&hsuc->vchan.lock, flags);
> 
> 
> -- 
> Andy Shevchenko <andriy.shevchenko@intel.com>
> Intel Finland Oy
> 

-- 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer
  2015-03-30 17:37     ` Vinod Koul
@ 2015-04-28 11:17       ` 'Greg Kroah-Hartman'
  2015-05-04 11:04         ` Vinod Koul
  0 siblings, 1 reply; 4+ messages in thread
From: 'Greg Kroah-Hartman' @ 2015-04-28 11:17 UTC (permalink / raw)
  To: Vinod Koul
  Cc: Peter Ujfalusi, Andy Shevchenko, linux-serial@vger.kernel.org,
	linux, dan.j.williams, dmaengine, linux-kernel, linux-arm-kernel

On Mon, Mar 30, 2015 at 11:07:32PM +0530, Vinod Koul wrote:
> On Fri, Mar 27, 2015 at 02:01:58PM +0200, Andy Shevchenko wrote:
> > On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
> > > The vd->node is removed from the lists when the transfer started so the
> > > vchan_get_all_descriptors() will not find it. This results memory leak.
> > > 
> > 
> > Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Acked-by: Vinod Koul <vinod.koul@intel.com>
> 
> Greg,
> 
> Please apply this in your queue for next

Apply what?  Can someone resend this in a format I can apply it in?

thanks,

gregk -h

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer
  2015-04-28 11:17       ` 'Greg Kroah-Hartman'
@ 2015-05-04 11:04         ` Vinod Koul
  0 siblings, 0 replies; 4+ messages in thread
From: Vinod Koul @ 2015-05-04 11:04 UTC (permalink / raw)
  To: 'Greg Kroah-Hartman'
  Cc: Peter Ujfalusi, Andy Shevchenko, linux-serial@vger.kernel.org,
	linux, dan.j.williams, dmaengine, linux-kernel, linux-arm-kernel

On Tue, Apr 28, 2015 at 01:17:08PM +0200, 'Greg Kroah-Hartman' wrote:
> On Mon, Mar 30, 2015 at 11:07:32PM +0530, Vinod Koul wrote:
> > On Fri, Mar 27, 2015 at 02:01:58PM +0200, Andy Shevchenko wrote:
> > > On Fri, 2015-03-27 at 13:35 +0200, Peter Ujfalusi wrote:
> > > > The vd->node is removed from the lists when the transfer started so the
> > > > vchan_get_all_descriptors() will not find it. This results memory leak.
> > > > 
> > > 
> > > Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > Acked-by: Vinod Koul <vinod.koul@intel.com>
> > 
> > Greg,
> > 
> > Please apply this in your queue for next
> 
> Apply what?  Can someone resend this in a format I can apply it in?

Ah sorry Greg, I thought you were cced in the orignal patch as well, so..

Peter, can you resend, now that this is in my next I will apply it

-- 
~Vinod

> 
> thanks,
> 
> gregk -h

-- 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-05-04 11:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1427456155-28990-1-git-send-email-peter.ujfalusi@ti.com>
     [not found] ` <1427456155-28990-5-git-send-email-peter.ujfalusi@ti.com>
2015-03-27 12:01   ` [PATCH 4/5] dmaengine: hsu: Fix memory leak when stopping a running transfer Andy Shevchenko
2015-03-30 17:37     ` Vinod Koul
2015-04-28 11:17       ` 'Greg Kroah-Hartman'
2015-05-04 11:04         ` Vinod Koul

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