2016-11-08 13:16:13

by Ivan Khoronzhuk

Subject: [PATCH] net: ethernet: ti: davinci_cpdma: free memory while channel destroy

While create/destroy channel operation memory is not freed. It was
supposed that memory is freed while driver remove. But a channel
can be created and destroyed many times while changing number of
channels with ethtool.

Based on net-next/master

Signed-off-by: Ivan Khoronzhuk <[email protected]>
---
drivers/net/ethernet/ti/davinci_cpdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 05afc05..07fc92d 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -586,7 +586,7 @@ int cpdma_chan_destroy(struct cpdma_chan *chan)
cpdma_chan_stop(chan);
ctlr->channels[chan->chan_num] = NULL;
ctlr->chan_num--;
-
+ devm_kfree(ctlr->dev, chan);
cpdma_chan_split_pool(ctlr);

spin_unlock_irqrestore(&ctlr->lock, flags);
--
1.9.1

2016-11-08 23:22:14

by Grygorii Strashko

Subject: Re: [PATCH] net: ethernet: ti: davinci_cpdma: free memory while channel destroy

On 11/08/2016 07:16 AM, Ivan Khoronzhuk wrote:
> While create/destroy channel operation memory is not freed. It was
> supposed that memory is freed while driver remove. But a channel
> can be created and destroyed many times while changing number of
> channels with ethtool.
>
> Based on net-next/master

^?

>
> Signed-off-by: Ivan Khoronzhuk <[email protected]>

Reviewed-by: Grygorii Strashko <[email protected]>

> ---
> drivers/net/ethernet/ti/davinci_cpdma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
> index 05afc05..07fc92d 100644
> --- a/drivers/net/ethernet/ti/davinci_cpdma.c
> +++ b/drivers/net/ethernet/ti/davinci_cpdma.c
> @@ -586,7 +586,7 @@ int cpdma_chan_destroy(struct cpdma_chan *chan)
> cpdma_chan_stop(chan);
> ctlr->channels[chan->chan_num] = NULL;
> ctlr->chan_num--;
> -
> + devm_kfree(ctlr->dev, chan);
> cpdma_chan_split_pool(ctlr);
>
> spin_unlock_irqrestore(&ctlr->lock, flags);
>

--
regards,
-grygorii

2016-11-13 02:07:40

by David Miller

Subject: Re: [PATCH] net: ethernet: ti: davinci_cpdma: free memory while channel destroy

From: Ivan Khoronzhuk <[email protected]>
Date: Tue, 8 Nov 2016 15:16:05 +0200

> While create/destroy channel operation memory is not freed. It was
> supposed that memory is freed while driver remove. But a channel
> can be created and destroyed many times while changing number of
> channels with ethtool.
>
> Based on net-next/master
>
> Signed-off-by: Ivan Khoronzhuk <[email protected]>

Applied.