ipv4: ip_tunnel: Convert ip_tunnel_delete_nets() callers to ->exit_rtnl().

ip_tunnel_delete_nets() iterates the dying netns list and performs the
same operations for each.

Let's export ip_tunnel_destroy() as ip_tunnel_delete_net() and call it
from ->exit_rtnl().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/20250411205258.63164-7-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index a36a335cef9fb4f86982aafad40993cf7d7b228d..0c3d571a04a1600cdd7005ddc0e35ac66a37f311 100644 (file)
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -377,10 +377,9 @@ struct net *ip_tunnel_get_link_net(const struct net_device *dev);
 int ip_tunnel_get_iflink(const struct net_device *dev);
 int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,
                       struct rtnl_link_ops *ops, char *devname);
-
-void ip_tunnel_delete_nets(struct list_head *list_net, unsigned int id,
-                          struct rtnl_link_ops *ops,
-                          struct list_head *dev_to_kill);
+void ip_tunnel_delete_net(struct net *net, unsigned int id,
+                         struct rtnl_link_ops *ops,
+                         struct list_head *dev_to_kill);
 
 void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
                    const struct iphdr *tnl_params, const u8 protocol);

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 26d15f907551e7d4427d87c95d4ca4187d9f1693..f5b9004d6938bdfbf7084eb6a233798f90922c91 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -1066,16 +1066,15 @@ static int __net_init ipgre_init_net(struct net *net)
        return ip_tunnel_init_net(net, ipgre_net_id, &ipgre_link_ops, NULL);
 }
 
-static void __net_exit ipgre_exit_batch_rtnl(struct list_head *list_net,
-                                            struct list_head *dev_to_kill)
+static void __net_exit ipgre_exit_rtnl(struct net *net,
+                                      struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(list_net, ipgre_net_id, &ipgre_link_ops,
-                             dev_to_kill);
+       ip_tunnel_delete_net(net, ipgre_net_id, &ipgre_link_ops, dev_to_kill);
 }
 
 static struct pernet_operations ipgre_net_ops = {
        .init = ipgre_init_net,
-       .exit_batch_rtnl = ipgre_exit_batch_rtnl,
+       .exit_rtnl = ipgre_exit_rtnl,
        .id   = &ipgre_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };
@@ -1752,16 +1751,15 @@ static int __net_init ipgre_tap_init_net(struct net *net)
        return ip_tunnel_init_net(net, gre_tap_net_id, &ipgre_tap_ops, "gretap0");
 }
 
-static void __net_exit ipgre_tap_exit_batch_rtnl(struct list_head *list_net,
-                                                struct list_head *dev_to_kill)
+static void __net_exit ipgre_tap_exit_rtnl(struct net *net,
+                                          struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(list_net, gre_tap_net_id, &ipgre_tap_ops,
-                             dev_to_kill);
+       ip_tunnel_delete_net(net, gre_tap_net_id, &ipgre_tap_ops, dev_to_kill);
 }
 
 static struct pernet_operations ipgre_tap_net_ops = {
        .init = ipgre_tap_init_net,
-       .exit_batch_rtnl = ipgre_tap_exit_batch_rtnl,
+       .exit_rtnl = ipgre_tap_exit_rtnl,
        .id   = &gre_tap_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };
@@ -1772,16 +1770,15 @@ static int __net_init erspan_init_net(struct net *net)
                                  &erspan_link_ops, "erspan0");
 }
 
-static void __net_exit erspan_exit_batch_rtnl(struct list_head *net_list,
-                                             struct list_head *dev_to_kill)
+static void __net_exit erspan_exit_rtnl(struct net *net,
+                                       struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(net_list, erspan_net_id, &erspan_link_ops,
-                             dev_to_kill);
+       ip_tunnel_delete_net(net, erspan_net_id, &erspan_link_ops, dev_to_kill);
 }
 
 static struct pernet_operations erspan_net_ops = {
        .init = erspan_init_net,
-       .exit_batch_rtnl = erspan_exit_batch_rtnl,
+       .exit_rtnl = erspan_exit_rtnl,
        .id   = &erspan_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 1024f961ec9addf5376862986e099de3125303cf..3913ec89ad207649404ce62423e8b2747aad59d4 100644 (file)
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -1174,13 +1174,16 @@ int ip_tunnel_init_net(struct net *net, unsigned int ip_tnl_net_id,
 }
 EXPORT_SYMBOL_GPL(ip_tunnel_init_net);
 
-static void ip_tunnel_destroy(struct net *net, struct ip_tunnel_net *itn,
-                             struct list_head *head,
-                             struct rtnl_link_ops *ops)
+void ip_tunnel_delete_net(struct net *net, unsigned int id,
+                         struct rtnl_link_ops *ops,
+                         struct list_head *head)
 {
+       struct ip_tunnel_net *itn = net_generic(net, id);
        struct net_device *dev, *aux;
        int h;
 
+       ASSERT_RTNL_NET(net);
+
        for_each_netdev_safe(net, dev, aux)
                if (dev->rtnl_link_ops == ops)
                        unregister_netdevice_queue(dev, head);
@@ -1198,21 +1201,7 @@ static void ip_tunnel_destroy(struct net *net, struct ip_tunnel_net *itn,
                                unregister_netdevice_queue(t->dev, head);
        }
 }
-
-void ip_tunnel_delete_nets(struct list_head *net_list, unsigned int id,
-                          struct rtnl_link_ops *ops,
-                          struct list_head *dev_to_kill)
-{
-       struct ip_tunnel_net *itn;
-       struct net *net;
-
-       ASSERT_RTNL();
-       list_for_each_entry(net, net_list, exit_list) {
-               itn = net_generic(net, id);
-               ip_tunnel_destroy(net, itn, dev_to_kill, ops);
-       }
-}
-EXPORT_SYMBOL_GPL(ip_tunnel_delete_nets);
+EXPORT_SYMBOL_GPL(ip_tunnel_delete_net);
 
 int ip_tunnel_newlink(struct net *net, struct net_device *dev,
                      struct nlattr *tb[], struct ip_tunnel_parm_kern *p,

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 159b4473290e0982c531db170c79457a1ad90f82..686e4f3d83aa7fd2639e16466a50ed3f257f2a88 100644 (file)
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -523,16 +523,15 @@ static int __net_init vti_init_net(struct net *net)
        return 0;
 }
 
-static void __net_exit vti_exit_batch_rtnl(struct list_head *list_net,
-                                          struct list_head *dev_to_kill)
+static void __net_exit vti_exit_rtnl(struct net *net,
+                                    struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(list_net, vti_net_id, &vti_link_ops,
-                             dev_to_kill);
+       ip_tunnel_delete_net(net, vti_net_id, &vti_link_ops, dev_to_kill);
 }
 
 static struct pernet_operations vti_net_ops = {
        .init = vti_init_net,
-       .exit_batch_rtnl = vti_exit_batch_rtnl,
+       .exit_rtnl = vti_exit_rtnl,
        .id   = &vti_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index bab0bf90c908da5fbe61de7033f263cf129c8b9a..3e03af073a1ccc3d7597a998a515b6cfdded40b5 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -604,16 +604,15 @@ static int __net_init ipip_init_net(struct net *net)
        return ip_tunnel_init_net(net, ipip_net_id, &ipip_link_ops, "tunl0");
 }
 
-static void __net_exit ipip_exit_batch_rtnl(struct list_head *list_net,
-                                           struct list_head *dev_to_kill)
+static void __net_exit ipip_exit_rtnl(struct net *net,
+                                     struct list_head *dev_to_kill)
 {
-       ip_tunnel_delete_nets(list_net, ipip_net_id, &ipip_link_ops,
-                             dev_to_kill);
+       ip_tunnel_delete_net(net, ipip_net_id, &ipip_link_ops, dev_to_kill);
 }
 
 static struct pernet_operations ipip_net_ops = {
        .init = ipip_init_net,
-       .exit_batch_rtnl = ipip_exit_batch_rtnl,
+       .exit_rtnl = ipip_exit_rtnl,
        .id   = &ipip_net_id,
        .size = sizeof(struct ip_tunnel_net),
 };