niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

geneve: speedup geneve tunnels dismantle

Browse source 
Since we now hold RTNL lock in geneve_exit_net, it's better batch them
to speedup geneve tunnel dismantle.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haishuang Yan 2017-12-16 17:54:50 +08:00 • committed by David S. Miller
parent 57b61127ab
commit 2843a25348
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/net/geneve.c
View file

@ -1638,19 +1638,16 @@ static __net_init int geneve_init_net(struct net *net)
return 0; return 0;
} }
static void __net_exit geneve_exit_net(struct net *net) static void geneve_destroy_tunnels(struct net *net, struct list_head *head)
{ {
struct geneve_net *gn = net_generic(net, geneve_net_id); struct geneve_net *gn = net_generic(net, geneve_net_id);
struct geneve_dev *geneve, *next; struct geneve_dev *geneve, *next;
struct net_device *dev, *aux; struct net_device *dev, *aux;
LIST_HEAD(list);
rtnl_lock();
/* gather any geneve devices that were moved into this ns */ /* gather any geneve devices that were moved into this ns */
for_each_netdev_safe(net, dev, aux) for_each_netdev_safe(net, dev, aux)
if (dev->rtnl_link_ops == &geneve_link_ops) if (dev->rtnl_link_ops == &geneve_link_ops)
unregister_netdevice_queue(dev, &list); unregister_netdevice_queue(dev, head);
/* now gather any other geneve devices that were created in this ns */ /* now gather any other geneve devices that were created in this ns */
list_for_each_entry_safe(geneve, next, &gn->geneve_list, next) { list_for_each_entry_safe(geneve, next, &gn->geneve_list, next) {
@ -1658,18 +1655,29 @@ static void __net_exit geneve_exit_net(struct net *net)
* to the list by the previous loop. * to the list by the previous loop.
*/ */
if (!net_eq(dev_net(geneve->dev), net)) if (!net_eq(dev_net(geneve->dev), net))
unregister_netdevice_queue(geneve->dev, &list); unregister_netdevice_queue(geneve->dev, head);
} }
WARN_ON_ONCE(!list_empty(&gn->sock_list));
}
static void __net_exit geneve_exit_batch_net(struct list_head *net_list)
{
struct net *net;
LIST_HEAD(list);
rtnl_lock();
list_for_each_entry(net, net_list, exit_list)
geneve_destroy_tunnels(net, &list);
/* unregister the devices gathered above */ /* unregister the devices gathered above */
unregister_netdevice_many(&list); unregister_netdevice_many(&list);
rtnl_unlock(); rtnl_unlock();
WARN_ON_ONCE(!list_empty(&gn->sock_list));
} }
static struct pernet_operations geneve_net_ops = { static struct pernet_operations geneve_net_ops = {
.init = geneve_init_net, .init = geneve_init_net,
.exit = geneve_exit_net, .exit_batch = geneve_exit_batch_net,
.id = &geneve_net_id, .id = &geneve_net_id,
.size = sizeof(struct geneve_net), .size = sizeof(struct geneve_net),
}; };