ipv4: Namespaceify tcp_retries1 sysctl knob (ae5c3f40) · Commits · e / devices / android_kernel_fairphone_FP3

include/net/netns/ipv4.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,7 @@ struct netns_ipv4 {
	int sysctl_tcp_synack_retries;		int sysctl_tcp_synack_retries;
	int sysctl_tcp_syncookies;		int sysctl_tcp_syncookies;
	int sysctl_tcp_reordering;		int sysctl_tcp_reordering;
			int sysctl_tcp_retries1;

	struct ping_group_range ping_group_range;		struct ping_group_range ping_group_range;

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_retries1;
	extern int sysctl_tcp_retries2;		extern int sysctl_tcp_retries2;
	extern int sysctl_tcp_orphan_retries;		extern int sysctl_tcp_orphan_retries;
	extern int sysctl_tcp_fastopen;		extern int sysctl_tcp_fastopen;

net/ipv4/sysctl_net_ipv4.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -319,14 +319,6 @@ static struct ctl_table ipv4_table[] = {
	.mode = 0644,		.mode = 0644,
	.proc_handler = proc_dointvec		.proc_handler = proc_dointvec
	},		},
	{
	.procname = "tcp_retries1",
	.data = &sysctl_tcp_retries1,
	.maxlen = sizeof(int),
	.mode = 0644,
	.proc_handler = proc_dointvec_minmax,
	.extra2 = &tcp_retr1_max
	},
	{		{
	.procname = "tcp_retries2",		.procname = "tcp_retries2",
	.data = &sysctl_tcp_retries2,		.data = &sysctl_tcp_retries2,
	@@ -960,6 +952,14 @@ static struct ctl_table ipv4_net_table[] = {
	.mode = 0644,		.mode = 0644,
	.proc_handler = proc_dointvec		.proc_handler = proc_dointvec
	},		},
			{
			.procname = "tcp_retries1",
			.data = &init_net.ipv4.sysctl_tcp_retries1,
			.maxlen = sizeof(int),
			.mode = 0644,
			.proc_handler = proc_dointvec_minmax,
			.extra2 = &tcp_retr1_max
			},
	{ }		{ }
	};		};

net/ipv4/tcp_ipv4.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2391,6 +2391,7 @@ static int __net_init tcp_sk_init(struct net *net)
	net->ipv4.sysctl_tcp_synack_retries = TCP_SYNACK_RETRIES;		net->ipv4.sysctl_tcp_synack_retries = TCP_SYNACK_RETRIES;
	net->ipv4.sysctl_tcp_syncookies = 0;		net->ipv4.sysctl_tcp_syncookies = 0;
	net->ipv4.sysctl_tcp_reordering = TCP_FASTRETRANS_THRESH;		net->ipv4.sysctl_tcp_reordering = TCP_FASTRETRANS_THRESH;
			net->ipv4.sysctl_tcp_retries1 = TCP_RETR1;

	return 0;		return 0;
	fail:		fail:

net/ipv4/tcp_timer.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@
	#include <linux/gfp.h>		#include <linux/gfp.h>
	#include <net/tcp.h>		#include <net/tcp.h>

	int sysctl_tcp_retries1 __read_mostly = TCP_RETR1;
	int sysctl_tcp_retries2 __read_mostly = TCP_RETR2;		int sysctl_tcp_retries2 __read_mostly = TCP_RETR2;
	int sysctl_tcp_orphan_retries __read_mostly;		int sysctl_tcp_orphan_retries __read_mostly;
	int sysctl_tcp_thin_linear_timeouts __read_mostly;		int sysctl_tcp_thin_linear_timeouts __read_mostly;
	@@ -171,7 +170,7 @@ static int tcp_write_timeout(struct sock *sk)
	retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;		retry_until = icsk->icsk_syn_retries ? : net->ipv4.sysctl_tcp_syn_retries;
	syn_set = true;		syn_set = true;
	} else {		} else {
	if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0, 0)) {		if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1, 0, 0)) {
	/* Some middle-boxes may black-hole Fast Open _after_		/* Some middle-boxes may black-hole Fast Open _after_
	* the handshake. Therefore we conservatively disable		* the handshake. Therefore we conservatively disable
	* Fast Open on this path on recurring timeouts with		* Fast Open on this path on recurring timeouts with
	@@ -180,7 +179,7 @@ static int tcp_write_timeout(struct sock *sk)
	if (tp->syn_data_acked &&		if (tp->syn_data_acked &&
	tp->bytes_acked <= tp->rx_opt.mss_clamp) {		tp->bytes_acked <= tp->rx_opt.mss_clamp) {
	tcp_fastopen_cache_set(sk, 0, NULL, true, 0);		tcp_fastopen_cache_set(sk, 0, NULL, true, 0);
	if (icsk->icsk_retransmits == sysctl_tcp_retries1)		if (icsk->icsk_retransmits == net->ipv4.sysctl_tcp_retries1)
	NET_INC_STATS_BH(sock_net(sk),		NET_INC_STATS_BH(sock_net(sk),
	LINUX_MIB_TCPFASTOPENACTIVEFAIL);		LINUX_MIB_TCPFASTOPENACTIVEFAIL);
	}		}
	@@ -359,6 +358,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk)
	void tcp_retransmit_timer(struct sock *sk)		void tcp_retransmit_timer(struct sock *sk)
	{		{
	struct tcp_sock *tp = tcp_sk(sk);		struct tcp_sock *tp = tcp_sk(sk);
			struct net *net = sock_net(sk);
	struct inet_connection_sock *icsk = inet_csk(sk);		struct inet_connection_sock *icsk = inet_csk(sk);

	if (tp->fastopen_rsk) {		if (tp->fastopen_rsk) {
	@@ -489,7 +489,7 @@ void tcp_retransmit_timer(struct sock *sk)
	icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);		icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
	}		}
	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);		inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
	if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0, 0))		if (retransmits_timed_out(sk, net->ipv4.sysctl_tcp_retries1 + 1, 0, 0))
	__sk_dst_reset(sk);		__sk_dst_reset(sk);

	out:;		out:;