bareudp: use exit_batch_rtnl() method
authorEric Dumazet <edumazet@google.com>
Tue, 6 Feb 2024 14:43:00 +0000 (14:43 +0000)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Feb 2024 02:55:11 +0000 (18:55 -0800)
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-5-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/bareudp.c

index 31377bb1cc97cba08e02dc7d48761068627af3fb..4db6122c9b43032a36b98916bb4390e3d6f08f68 100644 (file)
@@ -760,23 +760,18 @@ static void bareudp_destroy_tunnels(struct net *net, struct list_head *head)
                unregister_netdevice_queue(bareudp->dev, head);
 }
 
-static void __net_exit bareudp_exit_batch_net(struct list_head *net_list)
+static void __net_exit bareudp_exit_batch_rtnl(struct list_head *net_list,
+                                              struct list_head *dev_kill_list)
 {
        struct net *net;
-       LIST_HEAD(list);
 
-       rtnl_lock();
        list_for_each_entry(net, net_list, exit_list)
-               bareudp_destroy_tunnels(net, &list);
-
-       /* unregister the devices gathered above */
-       unregister_netdevice_many(&list);
-       rtnl_unlock();
+               bareudp_destroy_tunnels(net, dev_kill_list);
 }
 
 static struct pernet_operations bareudp_net_ops = {
        .init = bareudp_init_net,
-       .exit_batch = bareudp_exit_batch_net,
+       .exit_batch_rtnl = bareudp_exit_batch_rtnl,
        .id   = &bareudp_net_id,
        .size = sizeof(struct bareudp_net),
 };