Commit a967e01e authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

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: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Link: https://patch.msgid.link/20250411205258.63164-7-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6f2667b9

include/net/ip_tunnels.h

+3 −4
Original line number Diff line number Diff line
@@ -377,8 +377,7 @@ 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,

void ip_tunnel_delete_net(struct net *net, unsigned int id,

			  struct rtnl_link_ops *ops,

			  struct list_head *dev_to_kill);

net/ipv4/ip_gre.c

+12 −15
Original line number Diff line number Diff line
@@ -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,

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,

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,

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),

};

net/ipv4/ip_tunnel.c

+7 −18
Original line number Diff line number Diff line
@@ -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,

net/ipv4/ip_vti.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

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),

};

net/ipv4/ipip.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

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),

};