ip6mr: introduce ip6mr_net_exit_batch()

cleanup_net() is competing with other rtnl users.

Avoiding to acquire rtnl for each netns before calling
ip6mr_rules_exit() gives chance for cleanup_net()
to progress much faster, holding rtnl a bit longer.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index fd660414d482a30c6d339bb7360bd91d8f3c6f05..881fe6b503072598384b7d935eab66087cd555b6 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -253,13 +253,12 @@ static void __net_exit ip6mr_rules_exit(struct net *net)
 {
        struct mr_table *mrt, *next;
 
-       rtnl_lock();
+       ASSERT_RTNL();
        list_for_each_entry_safe(mrt, next, &net->ipv6.mr6_tables, list) {
                list_del(&mrt->list);
                ip6mr_free_table(mrt);
        }
        fib_rules_unregister(net->ipv6.mr6_rules_ops);
-       rtnl_unlock();
 }
 
 static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb,
@@ -316,10 +315,9 @@ static int __net_init ip6mr_rules_init(struct net *net)
 
 static void __net_exit ip6mr_rules_exit(struct net *net)
 {
-       rtnl_lock();
+       ASSERT_RTNL();
        ip6mr_free_table(net->ipv6.mrt6);
        net->ipv6.mrt6 = NULL;
-       rtnl_unlock();
 }
 
 static int ip6mr_rules_dump(struct net *net, struct notifier_block *nb,
@@ -1323,7 +1321,9 @@ static int __net_init ip6mr_net_init(struct net *net)
 proc_cache_fail:
        remove_proc_entry("ip6_mr_vif", net->proc_net);
 proc_vif_fail:
+       rtnl_lock();
        ip6mr_rules_exit(net);
+       rtnl_unlock();
 #endif
 ip6mr_rules_fail:
        ip6mr_notifier_exit(net);
@@ -1336,13 +1336,23 @@ static void __net_exit ip6mr_net_exit(struct net *net)
        remove_proc_entry("ip6_mr_cache", net->proc_net);
        remove_proc_entry("ip6_mr_vif", net->proc_net);
 #endif
-       ip6mr_rules_exit(net);
        ip6mr_notifier_exit(net);
 }
 
+static void __net_exit ip6mr_net_exit_batch(struct list_head *net_list)
+{
+       struct net *net;
+
+       rtnl_lock();
+       list_for_each_entry(net, net_list, exit_list)
+               ip6mr_rules_exit(net);
+       rtnl_unlock();
+}
+
 static struct pernet_operations ip6mr_net_ops = {
        .init = ip6mr_net_init,
        .exit = ip6mr_net_exit,
+       .exit_batch = ip6mr_net_exit_batch,
 };
 
 int __init ip6_mr_init(void)