* [PATCHv2 net-next] sunvnet: clean up objects created in vnet_new() on vnet_exit()
@ 2014-07-16 14:02 Sowmini Varadhan
2014-07-17 5:44 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Sowmini Varadhan @ 2014-07-16 14:02 UTC (permalink / raw)
To: davem, dave.kleikamp, karl.volz; +Cc: netdev
Nothing cleans up the objects created by
vnet_new(), they are completely leaked.
vnet_exit(), after doing the vio_unregister_driver() to clean
up ports, should call a helper function that iterates over vnet_list
and cleans up those objects. This includes unregister_netdevice()
as well as free_netdev().
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Reviewed-by: Karl Volz <karl.volz@oracle.com>
---
v2: incorporated comments from David Miller.
v3: muttrc config tweaks to avoid list-rejection
and set up correct From/Message-ID headers.
drivers/net/ethernet/sun/sunvnet.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 1c24a8f..fd411d6 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1083,6 +1083,24 @@ static struct vnet *vnet_find_or_create(const u64 *local_mac)
return vp;
}
+static void vnet_cleanup(void)
+{
+ struct vnet *vp;
+ struct net_device *dev;
+
+ mutex_lock(&vnet_list_mutex);
+ while (!list_empty(&vnet_list)) {
+ vp = list_first_entry(&vnet_list, struct vnet, list);
+ list_del(&vp->list);
+ dev = vp->dev;
+ /* vio_unregister_driver() should have cleaned up port_list */
+ BUG_ON(!list_empty(&vp->port_list));
+ unregister_netdev(dev);
+ free_netdev(dev);
+ }
+ mutex_unlock(&vnet_list_mutex);
+}
+
static const char *local_mac_prop = "local-mac-address";
static struct vnet *vnet_find_parent(struct mdesc_handle *hp,
@@ -1240,7 +1258,6 @@ static int vnet_port_remove(struct vio_dev *vdev)
kfree(port);
- unregister_netdev(vp->dev);
}
return 0;
}
@@ -1268,6 +1285,7 @@ static int __init vnet_init(void)
static void __exit vnet_exit(void)
{
vio_unregister_driver(&vnet_port_driver);
+ vnet_cleanup();
}
module_init(vnet_init);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCHv2 net-next] sunvnet: clean up objects created in vnet_new() on vnet_exit()
2014-07-16 14:02 [PATCHv2 net-next] sunvnet: clean up objects created in vnet_new() on vnet_exit() Sowmini Varadhan
@ 2014-07-17 5:44 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-07-17 5:44 UTC (permalink / raw)
To: sowmini.varadhan; +Cc: dave.kleikamp, karl.volz, netdev
From: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Date: Wed, 16 Jul 2014 10:02:26 -0400
>
> Nothing cleans up the objects created by
> vnet_new(), they are completely leaked.
>
> vnet_exit(), after doing the vio_unregister_driver() to clean
> up ports, should call a helper function that iterates over vnet_list
> and cleans up those objects. This includes unregister_netdevice()
> as well as free_netdev().
>
> Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
> Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com>
> Reviewed-by: Karl Volz <karl.volz@oracle.com>
>
> ---
> v2: incorporated comments from David Miller.
> v3: muttrc config tweaks to avoid list-rejection
> and set up correct From/Message-ID headers.
Looks great, applied and queued up for -stable, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-17 5:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-16 14:02 [PATCHv2 net-next] sunvnet: clean up objects created in vnet_new() on vnet_exit() Sowmini Varadhan
2014-07-17 5:44 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.