Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ipv4: Namespaceify tcp syn retries sysctl knob 



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

include/net/netns/ipv4.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,8 @@ struct netns_ipv4 { 
	int sysctl_tcp_keepalive_probes;

	int sysctl_tcp_keepalive_probes;

	int sysctl_tcp_keepalive_intvl;

	int sysctl_tcp_keepalive_intvl;





	int sysctl_tcp_syn_retries;



	struct ping_group_range ping_group_range;

	struct ping_group_range ping_group_range;





	atomic_t dev_addr_genid;

	atomic_t dev_addr_genid;

include/net/tcp.h

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

extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_fin_timeout;

extern int sysctl_tcp_syn_retries;

extern int sysctl_tcp_synack_retries;

extern int sysctl_tcp_synack_retries;

extern int sysctl_tcp_retries1;

extern int sysctl_tcp_retries1;

extern int sysctl_tcp_retries2;

extern int sysctl_tcp_retries2;

net/ipv4/sysctl_net_ipv4.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -291,15 +291,6 @@ static struct ctl_table ipv4_table[] = { 
		.extra1		= &ip_ttl_min,

		.extra1		= &ip_ttl_min,

		.extra2		= &ip_ttl_max,

		.extra2		= &ip_ttl_max,

	},

	},

	{

		.procname	= "tcp_syn_retries",

		.data		= &sysctl_tcp_syn_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_syn_retries_min,

		.extra2		= &tcp_syn_retries_max

	},

	{

	{

		.procname	= "tcp_synack_retries",

		.procname	= "tcp_synack_retries",

		.data		= &sysctl_tcp_synack_retries,

		.data		= &sysctl_tcp_synack_retries,
@@ -960,6 +951,15 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec_jiffies,

		.proc_handler	= proc_dointvec_jiffies,

	},

	},

	{

		.procname	= "tcp_syn_retries",

		.data		= &init_net.ipv4.sysctl_tcp_syn_retries,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_syn_retries_min,

		.extra2		= &tcp_syn_retries_max

	},

	{ }

	{ }

};

};

net/ipv4/tcp.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2731,6 +2731,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level, 
{

{

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp_sock *tp = tcp_sk(sk);

	struct net *net = sock_net(sk);

	int val, len;

	int val, len;





	if (get_user(len, optlen))

	if (get_user(len, optlen))
@@ -2765,7 +2766,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level, 
		val = keepalive_probes(tp);

		val = keepalive_probes(tp);

		break;

		break;

	case TCP_SYNCNT:

	case TCP_SYNCNT:

		val = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;

		val = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;

		break;

		break;

	case TCP_LINGER2:

	case TCP_LINGER2:

		val = tp->linger2;

		val = tp->linger2;

net/ipv4/tcp_ipv4.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2388,6 +2388,8 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_keepalive_probes = TCP_KEEPALIVE_PROBES;

	net->ipv4.sysctl_tcp_keepalive_probes = TCP_KEEPALIVE_PROBES;

	net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;

	net->ipv4.sysctl_tcp_keepalive_intvl = TCP_KEEPALIVE_INTVL;





	net->ipv4.sysctl_tcp_syn_retries = TCP_SYN_RETRIES;



	return 0;

	return 0;

fail:

fail:

	tcp_sk_exit(net);

	tcp_sk_exit(net);