OSDN Git Service

can: gw: switch cangw_pernet_exit() to batch mode
authorEric Dumazet <edumazet@google.com>
Tue, 8 Feb 2022 04:50:36 +0000 (20:50 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 9 Feb 2022 04:41:35 +0000 (20:41 -0800)
cleanup_net() is competing with other rtnl users.

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

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/can/gw.c

index d8861e8..2422135 100644 (file)
@@ -1239,16 +1239,19 @@ static int __net_init cangw_pernet_init(struct net *net)
        return 0;
 }
 
-static void __net_exit cangw_pernet_exit(struct net *net)
+static void __net_exit cangw_pernet_exit_batch(struct list_head *net_list)
 {
+       struct net *net;
+
        rtnl_lock();
-       cgw_remove_all_jobs(net);
+       list_for_each_entry(net, net_list, exit_list)
+               cgw_remove_all_jobs(net);
        rtnl_unlock();
 }
 
 static struct pernet_operations cangw_pernet_ops = {
        .init = cangw_pernet_init,
-       .exit = cangw_pernet_exit,
+       .exit_batch = cangw_pernet_exit_batch,
 };
 
 static __init int cgw_module_init(void)