* [PATCH] rps: memory leak due to forget to release rx queues
@ 2010-03-23 6:05 Changli Gao
2010-03-23 6:44 ` Tom Herbert
0 siblings, 1 reply; 3+ messages in thread
From: Changli Gao @ 2010-03-23 6:05 UTC (permalink / raw)
To: David S. Miller; +Cc: xiaosuo, Tom Herbert, netdev
memory leak due to forget to release rx queues.
rx queues is allocated in alloc_netdev_mq(), but they aren't released in
free_netdev(), and the field rps_map is also miss.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
----
net/core/dev.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index c0e2608..51b86e0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5746,6 +5746,14 @@ void free_netdev(struct net_device *dev)
release_net(dev_net(dev));
+ if (dev->num_rx_queues) {
+ int i;
+
+ for (i = 0; i < dev->num_rx_queues; i++)
+ kfree(dev->_rx[i].rps_map);
+ kfree(dev->_rx);
+ }
+
kfree(dev->_tx);
/* Flush device addresses */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] rps: memory leak due to forget to release rx queues
2010-03-23 6:05 [PATCH] rps: memory leak due to forget to release rx queues Changli Gao
@ 2010-03-23 6:44 ` Tom Herbert
2010-03-23 7:02 ` Changli Gao
0 siblings, 1 reply; 3+ messages in thread
From: Tom Herbert @ 2010-03-23 6:44 UTC (permalink / raw)
To: xiaosuo; +Cc: David S. Miller, netdev
2010/3/22 Changli Gao <xiaosuo@gmail.com>:
> memory leak due to forget to release rx queues.
>
> rx queues is allocated in alloc_netdev_mq(), but they aren't released in
> free_netdev(), and the field rps_map is also miss.
>
rx_queues can't be free from free_netdev since they contain kobjects
(only freed when refcnt goes to zero). They should be freed when the
device kobject is freed (netdev_unregister_kobject).
Tom
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
> ----
> net/core/dev.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index c0e2608..51b86e0 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -5746,6 +5746,14 @@ void free_netdev(struct net_device *dev)
>
> release_net(dev_net(dev));
>
> + if (dev->num_rx_queues) {
> + int i;
> +
> + for (i = 0; i < dev->num_rx_queues; i++)
> + kfree(dev->_rx[i].rps_map);
> + kfree(dev->_rx);
> + }
> +
> kfree(dev->_tx);
>
> /* Flush device addresses */
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] rps: memory leak due to forget to release rx queues
2010-03-23 6:44 ` Tom Herbert
@ 2010-03-23 7:02 ` Changli Gao
0 siblings, 0 replies; 3+ messages in thread
From: Changli Gao @ 2010-03-23 7:02 UTC (permalink / raw)
To: Tom Herbert; +Cc: David S. Miller, netdev
On Tue, Mar 23, 2010 at 2:44 PM, Tom Herbert <therbert@google.com> wrote:
> 2010/3/22 Changli Gao <xiaosuo@gmail.com>:
>> memory leak due to forget to release rx queues.
>>
>> rx queues is allocated in alloc_netdev_mq(), but they aren't released in
>> free_netdev(), and the field rps_map is also miss.
>>
Thanks for explaining.
--
Regards，
Changli Gao(xiaosuo@gmail.com)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-23 7:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-23 6:05 [PATCH] rps: memory leak due to forget to release rx queues Changli Gao
2010-03-23 6:44 ` Tom Herbert
2010-03-23 7:02 ` Changli Gao
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).