From 4e8aaae71c5d2b4862b1b87545f4544cde153b21 Mon Sep 17 00:00:00 2001 From: Andrey Vagin Date: Tue, 4 Apr 2017 09:26:00 +0200 Subject: [PATCH] net: use net->count to check whether a netns is alive or not MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit BugLink: http://bugs.launchpad.net/bugs/1672144 The previous idea was to check whether a net namespace is in net_exit_list or not. It doesn't work, because net->exit_list is used in __register_pernet_operations and __unregister_pernet_operations where all namespaces are added to a temporary list to make cleanup in a error case, so list_empty(&net->exit_list) always returns false. Reported-by: Mantas Mikulėnas Fixes: 002d8a1a6c11 ("net: skip genenerating uevents for network namespaces that are exiting") Signed-off-by: Andrei Vagin Signed-off-by: David S. Miller (back ported from commit 91864f5852f9996210fad400cf70fb85af091243) Signed-off-by: Tim Gardner Conflicts: net/core/net-sysfs.c Acked-by: Joseph Salisbury Acked-by: Marcelo Cerri Signed-off-by: Stefan Bader --- net/core/net-sysfs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index f88a62ab019d..056b5ca5df69 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -931,6 +931,10 @@ net_rx_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) } while (--i >= new_num) { + struct kobject *kobj = &dev->_rx[i].kobj; + + if (!atomic_read(&dev_net(dev)->count)) + kobj->uevent_suppress = 1; if (dev->sysfs_rx_queue_group) sysfs_remove_group(&dev->_rx[i].kobj, dev->sysfs_rx_queue_group); @@ -1321,6 +1325,8 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num) while (--i >= new_num) { struct netdev_queue *queue = dev->_tx + i; + if (!atomic_read(&dev_net(dev)->count)) + queue->kobj.uevent_suppress = 1; #ifdef CONFIG_BQL sysfs_remove_group(&queue->kobj, &dql_group); #endif @@ -1506,6 +1512,9 @@ void netdev_unregister_kobject(struct net_device *ndev) { struct device *dev = &(ndev->dev); + if (!atomic_read(&dev_net(ndev)->count)) + dev_set_uevent_suppress(dev, 1); + kobject_get(&dev->kobj); remove_queue_kobjects(ndev); -- 2.39.5