2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00

ipvs: batch __ip_vs_dev_cleanup

It's better to batch __ip_vs_cleanup to speedup ipvs
devices dismantle.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Haishuang Yan 2019-09-27 12:54:51 +08:00 committed by Simon Horman
parent 5d5a0815f8
commit ac524481d7

View File

@ -2433,14 +2433,19 @@ hook_fail:
return ret; return ret;
} }
static void __net_exit __ip_vs_dev_cleanup(struct net *net) static void __net_exit __ip_vs_dev_cleanup_batch(struct list_head *net_list)
{ {
struct netns_ipvs *ipvs = net_ipvs(net); struct netns_ipvs *ipvs;
struct net *net;
EnterFunction(2); EnterFunction(2);
nf_unregister_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops)); list_for_each_entry(net, net_list, exit_list) {
ipvs->enable = 0; /* Disable packet reception */ ipvs = net_ipvs(net);
smp_wmb(); nf_unregister_net_hooks(net, ip_vs_ops, ARRAY_SIZE(ip_vs_ops));
ip_vs_sync_net_cleanup(ipvs); ipvs->enable = 0; /* Disable packet reception */
smp_wmb();
ip_vs_sync_net_cleanup(ipvs);
}
LeaveFunction(2); LeaveFunction(2);
} }
@ -2453,7 +2458,7 @@ static struct pernet_operations ipvs_core_ops = {
static struct pernet_operations ipvs_core_dev_ops = { static struct pernet_operations ipvs_core_dev_ops = {
.init = __ip_vs_dev_init, .init = __ip_vs_dev_init,
.exit = __ip_vs_dev_cleanup, .exit_batch = __ip_vs_dev_cleanup_batch,
}; };
/* /*