ipvs: batch __ip_vs_cleanup (5d5a0815) · Commits · 戴 / test

include/net/ip_vs.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1324,7 +1324,7 @@ void ip_vs_protocol_net_cleanup(struct netns_ipvs *ipvs);
		void ip_vs_control_net_cleanup(struct netns_ipvs *ipvs);
		void ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs);
		void ip_vs_sync_net_cleanup(struct netns_ipvs *ipvs);
		void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);
		void ip_vs_service_nets_cleanup(struct list_head *net_list);

		/* IPVS application functions
		* (from ip_vs_app.c)

+16 −12

Original line number	Diff line number	Diff line
		@@ -2402,11 +2402,14 @@ estimator_fail:
		return -ENOMEM;
		}

		static void __net_exit __ip_vs_cleanup(struct net *net)
		static void __net_exit __ip_vs_cleanup_batch(struct list_head *net_list)
		{
		struct netns_ipvs *ipvs = net_ipvs(net);
		struct netns_ipvs *ipvs;
		struct net *net;

		ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */
		ip_vs_service_nets_cleanup(net_list); /* ip_vs_flush() with locks */
		list_for_each_entry(net, net_list, exit_list) {
		ipvs = net_ipvs(net);
		ip_vs_conn_net_cleanup(ipvs);
		ip_vs_app_net_cleanup(ipvs);
		ip_vs_protocol_net_cleanup(ipvs);
		@@ -2415,6 +2418,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
		IP_VS_DBG(2, "ipvs netns %d released\n", ipvs->gen);
		net->ipvs = NULL;
		}
		}

		static int __net_init __ip_vs_dev_init(struct net *net)
		{
		@@ -2442,7 +2446,7 @@ static void __net_exit __ip_vs_dev_cleanup(struct net *net)

		static struct pernet_operations ipvs_core_ops = {
		.init = __ip_vs_init,
		.exit = __ip_vs_cleanup,
		.exit_batch = __ip_vs_cleanup_batch,
		.id = &ip_vs_net_id,
		.size = sizeof(struct netns_ipvs),
		};

+9 −3

Original line number	Diff line number	Diff line
		@@ -1607,14 +1607,20 @@ static int ip_vs_flush(struct netns_ipvs *ipvs, bool cleanup)

		/*
		* Delete service by {netns} in the service table.
		* Called by __ip_vs_cleanup()
		* Called by __ip_vs_batch_cleanup()
		*/
		void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs)
		void ip_vs_service_nets_cleanup(struct list_head *net_list)
		{
		struct netns_ipvs *ipvs;
		struct net *net;

		EnterFunction(2);
		/* Check for "full" addressed entries */
		mutex_lock(&__ip_vs_mutex);
		list_for_each_entry(net, net_list, exit_list) {
		ipvs = net_ipvs(net);
		ip_vs_flush(ipvs, true);
		}
		mutex_unlock(&__ip_vs_mutex);
		LeaveFunction(2);
		}