sit: use exit_batch_rtnl() method

exit_batch_rtnl() is called while RTNL is held,
and devices to be unregistered can be queued in the dev_kill_list.

This saves one rtnl_lock()/rtnl_unlock() pair
and one unregister_netdevice_many() call.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
Link: https://lore.kernel.org/r/20240206144313.2050392-14-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index cc24cefdb85c0944c03c019b1c4214302d18e2c8..61b2b71fa8bedea6d185348ff781356652434b33 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1875,22 +1875,19 @@ err_alloc_dev:
        return err;
 }
 
-static void __net_exit sit_exit_batch_net(struct list_head *net_list)
+static void __net_exit sit_exit_batch_rtnl(struct list_head *net_list,
+                                          struct list_head *dev_to_kill)
 {
-       LIST_HEAD(list);
        struct net *net;
 
-       rtnl_lock();
+       ASSERT_RTNL();
        list_for_each_entry(net, net_list, exit_list)
-               sit_destroy_tunnels(net, &list);
-
-       unregister_netdevice_many(&list);
-       rtnl_unlock();
+               sit_destroy_tunnels(net, dev_to_kill);
 }
 
 static struct pernet_operations sit_net_ops = {
        .init = sit_init_net,
-       .exit_batch = sit_exit_batch_net,
+       .exit_batch_rtnl = sit_exit_batch_rtnl,
        .id   = &sit_net_id,
        .size = sizeof(struct sit_net),
 };