net: Move net:netns_ids destruction out of rtnl_lock() and document locking scheme

Currently, we unhash a dying net from netns_ids lists
under rtnl_lock(). It's a leftover from the time when
net::netns_ids was introduced. There was no net::nsid_lock,
and rtnl_lock() was mostly need to order modification
of alive nets nsid idr, i.e. for:
	for_each_net(tmp) {
		...
		id = __peernet2id(tmp, net);
		idr_remove(&tmp->netns_ids, id);
		...
	}

Since we have net::nsid_lock, the modifications are
protected by this local lock, and now we may introduce
better scheme of netns_ids destruction.

Let's look at the functions peernet2id_alloc() and
get_net_ns_by_id(). Previous commits taught these
functions to work well with dying net acquired from
rtnl unlocked lists. And they are the only functions
which can hash a net to netns_ids or obtain from there.
And as easy to check, other netns_ids operating functions
works with id, not with net pointers. So, we do not
need rtnl_lock to synchronize cleanup_net() with all them.

The another property, which is used in the patch,
is that net is unhashed from net_namespace_list
in the only place and by the only process. So,
we avoid excess rcu_read_lock() or rtnl_lock(),
when we'are iterating over the list in unhash_nsid().

All the above makes possible to keep rtnl_lock() locked
only for net->list deletion, and completely avoid it
for netns_ids unhashing and destruction. As these two
doings may take long time (e.g., memory allocation
to send skb), the patch should positively act on
the scalability and signify decrease the time, which
rtnl_lock() is held in cleanup_net().

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 1ccb953b3b096cae2bc355b5fe20d89e40e8649d..3cad5f51afd3c87ecb5420e8ee5c57741ae644ac 100644 (file)
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -439,13 +439,40 @@ struct net *copy_net_ns(unsigned long flags,
        return net;
 }
 
+static void unhash_nsid(struct net *net, struct net *last)
+{
+       struct net *tmp;
+       /* This function is only called from cleanup_net() work,
+        * and this work is the only process, that may delete
+        * a net from net_namespace_list. So, when the below
+        * is executing, the list may only grow. Thus, we do not
+        * use for_each_net_rcu() or rtnl_lock().
+        */
+       for_each_net(tmp) {
+               int id;
+
+               spin_lock_bh(&tmp->nsid_lock);
+               id = __peernet2id(tmp, net);
+               if (id >= 0)
+                       idr_remove(&tmp->netns_ids, id);
+               spin_unlock_bh(&tmp->nsid_lock);
+               if (id >= 0)
+                       rtnl_net_notifyid(tmp, RTM_DELNSID, id);
+               if (tmp == last)
+                       break;
+       }
+       spin_lock_bh(&net->nsid_lock);
+       idr_destroy(&net->netns_ids);
+       spin_unlock_bh(&net->nsid_lock);
+}
+
 static DEFINE_SPINLOCK(cleanup_list_lock);
 static LIST_HEAD(cleanup_list);  /* Must hold cleanup_list_lock to touch */
 
 static void cleanup_net(struct work_struct *work)
 {
        const struct pernet_operations *ops;
-       struct net *net, *tmp;
+       struct net *net, *tmp, *last;
        struct list_head net_kill_list;
        LIST_HEAD(net_exit_list);
 
@@ -458,26 +485,25 @@ static void cleanup_net(struct work_struct *work)
 
        /* Don't let anyone else find us. */
        rtnl_lock();
-       list_for_each_entry(net, &net_kill_list, cleanup_list) {
+       list_for_each_entry(net, &net_kill_list, cleanup_list)
                list_del_rcu(&net->list);
-               list_add_tail(&net->exit_list, &net_exit_list);
-               for_each_net(tmp) {
-                       int id;
-
-                       spin_lock_bh(&tmp->nsid_lock);
-                       id = __peernet2id(tmp, net);
-                       if (id >= 0)
-                               idr_remove(&tmp->netns_ids, id);
-                       spin_unlock_bh(&tmp->nsid_lock);
-                       if (id >= 0)
-                               rtnl_net_notifyid(tmp, RTM_DELNSID, id);
-               }
-               spin_lock_bh(&net->nsid_lock);
-               idr_destroy(&net->netns_ids);
-               spin_unlock_bh(&net->nsid_lock);
+       /* Cache last net. After we unlock rtnl, no one new net
+        * added to net_namespace_list can assign nsid pointer
+        * to a net from net_kill_list (see peernet2id_alloc()).
+        * So, we skip them in unhash_nsid().
+        *
+        * Note, that unhash_nsid() does not delete nsid links
+        * between net_kill_list's nets, as they've already
+        * deleted from net_namespace_list. But, this would be
+        * useless anyway, as netns_ids are destroyed there.
+        */
+       last = list_last_entry(&net_namespace_list, struct net, list);
+       rtnl_unlock();
 
+       list_for_each_entry(net, &net_kill_list, cleanup_list) {
+               unhash_nsid(net, last);
+               list_add_tail(&net->exit_list, &net_exit_list);
        }
-       rtnl_unlock();
 
        /*
         * Another CPU might be rcu-iterating the list, wait for it.