Commit b840d15d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespecify the tcp_keepalive_intvl sysctl knob 



This is the final part required to namespaceify the tcp
keep alive mechanism.

Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9bd6861b

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct netns_ipv4 { 


	int sysctl_tcp_keepalive_time;

	int sysctl_tcp_keepalive_probes;

	int sysctl_tcp_keepalive_intvl;



	struct ping_group_range ping_group_range;

include/net/tcp.h

+3 −2
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ extern int sysctl_tcp_timestamps; 
extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_keepalive_intvl;

extern int sysctl_tcp_syn_retries;

extern int sysctl_tcp_synack_retries;

extern int sysctl_tcp_retries1;
@@ -1223,7 +1222,9 @@ void tcp_enter_memory_pressure(struct sock *sk); 


static inline int keepalive_intvl_when(const struct tcp_sock *tp)

{

	return tp->keepalive_intvl ? : sysctl_tcp_keepalive_intvl;

	struct net *net = sock_net((struct sock *)tp);



	return tp->keepalive_intvl ? : net->ipv4.sysctl_tcp_keepalive_intvl;

}



static inline int keepalive_time_when(const struct tcp_sock *tp)

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -336,13 +336,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_keepalive_intvl",

		.data		= &sysctl_tcp_keepalive_intvl,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{

		.procname	= "tcp_retries1",

		.data		= &sysctl_tcp_retries1,
@@ -961,6 +954,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_keepalive_intvl",

		.data		= &init_net.ipv4.sysctl_tcp_keepalive_intvl,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

	},

	{ }

};

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -2387,6 +2387,7 @@ static int __net_init tcp_sk_init(struct net *net) 


	net->ipv4.sysctl_tcp_keepalive_time = TCP_KEEPALIVE_TIME;

	net->ipv4.sysctl_tcp_keepalive_probes = TCP_KEEPALIVE_PROBES;

	net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;



	return 0;

fail:

net/ipv4/tcp_timer.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;

int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;

int sysctl_tcp_keepalive_intvl __read_mostly = TCP_KEEPALIVE_INTVL;

int sysctl_tcp_retries1 __read_mostly = TCP_RETR1;

int sysctl_tcp_retries2 __read_mostly = TCP_RETR2;

int sysctl_tcp_orphan_retries __read_mostly;