Commit 94485fed authored by Alex Gartrell's avatar Alex Gartrell Committed by Simon Horman
Browse files

ipvs: add schedule_icmp sysctl 



This sysctl will be used to enable the scheduling of icmp packets.

Signed-off-by: default avatarAlex Gartrell <agartrell@fb.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent ee78378f

include/net/ip_vs.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -997,6 +997,7 @@ struct netns_ipvs { 
	int			sysctl_pmtu_disc;

	int			sysctl_pmtu_disc;

	int			sysctl_backup_only;

	int			sysctl_backup_only;

	int			sysctl_conn_reuse_mode;

	int			sysctl_conn_reuse_mode;

	int			sysctl_schedule_icmp;





	/* ip_vs_lblc */

	/* ip_vs_lblc */

	int			sysctl_lblc_expiration;

	int			sysctl_lblc_expiration;
@@ -1115,6 +1116,11 @@ static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs) 
	return ipvs->sysctl_conn_reuse_mode;

	return ipvs->sysctl_conn_reuse_mode;

}

}





static inline int sysctl_schedule_icmp(struct netns_ipvs *ipvs)

{

	return ipvs->sysctl_schedule_icmp;

}



#else

#else





static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)

static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -1187,6 +1193,11 @@ static inline int sysctl_conn_reuse_mode(struct netns_ipvs *ipvs) 
	return 1;

	return 1;

}

}





static inline int sysctl_schedule_icmp(struct netns_ipvs *ipvs)

{

	return 0;

}



#endif

#endif





/* IPVS core functions

/* IPVS core functions

net/netfilter/ipvs/ip_vs_ctl.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -1844,6 +1844,12 @@ static struct ctl_table vs_vars[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

		.proc_handler	= proc_dointvec,

	},

	},

	{

		.procname	= "schedule_icmp",

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#ifdef CONFIG_IP_VS_DEBUG

#ifdef CONFIG_IP_VS_DEBUG

	{

	{

		.procname	= "debug_level",

		.procname	= "debug_level",
@@ -3895,7 +3901,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) 
	tbl[idx++].data = &ipvs->sysctl_backup_only;

	tbl[idx++].data = &ipvs->sysctl_backup_only;

	ipvs->sysctl_conn_reuse_mode = 1;

	ipvs->sysctl_conn_reuse_mode = 1;

	tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;

	tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;



	tbl[idx++].data = &ipvs->sysctl_schedule_icmp;





	ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);

	ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);

	if (ipvs->sysctl_hdr == NULL) {

	if (ipvs->sysctl_hdr == NULL) {