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

Commit b510f0d2 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: Namespace-ify sysctl_tcp_slow_start_after_idle 



Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c04ac8a

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ struct netns_ipv4 { 
	int sysctl_tcp_early_retrans;

	int sysctl_tcp_recovery;

	int sysctl_tcp_thin_linear_timeouts;

	int sysctl_tcp_slow_start_after_idle;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+1 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ extern int sysctl_tcp_nometrics_save; 
extern int sysctl_tcp_moderate_rcvbuf;

extern int sysctl_tcp_tso_win_divisor;

extern int sysctl_tcp_workaround_signed_windows;

extern int sysctl_tcp_slow_start_after_idle;



#define TCP_RACK_LOSS_DETECTION  0x1 /* Use RACK to detect losses */
@@ -1308,7 +1307,7 @@ static inline void tcp_slow_start_after_idle_check(struct sock *sk) 
	struct tcp_sock *tp = tcp_sk(sk);

	s32 delta;



	if (!sysctl_tcp_slow_start_after_idle || tp->packets_out ||

	if (!sock_net(sk)->ipv4.sysctl_tcp_slow_start_after_idle || tp->packets_out ||

	    ca_ops->cong_control)

		return;

	delta = tcp_jiffies32 - tp->lsndtime;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_slow_start_after_idle",

		.data		= &sysctl_tcp_slow_start_after_idle,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#ifdef CONFIG_NETLABEL

	{

		.procname	= "cipso_cache_enable",
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode           = 0644,

		.proc_handler   = proc_dointvec

	},

	{

		.procname	= "tcp_slow_start_after_idle",

		.data		= &init_net.ipv4.sysctl_tcp_slow_start_after_idle,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -2486,6 +2486,7 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_timestamps = 1;

	net->ipv4.sysctl_tcp_early_retrans = 3;

	net->ipv4.sysctl_tcp_recovery = TCP_RACK_LOSS_DETECTION;

	net->ipv4.sysctl_tcp_slow_start_after_idle = 1; /* By default, RFC2861 behavior.  */



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);

net/ipv4/tcp_output.c

+1 −4
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ int sysctl_tcp_limit_output_bytes __read_mostly = 262144; 
 */

int sysctl_tcp_tso_win_divisor __read_mostly = 3;



/* By default, RFC2861 behavior.  */

int sysctl_tcp_slow_start_after_idle __read_mostly = 1;



static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,

			   int push_one, gfp_t gfp);
@@ -1690,7 +1687,7 @@ static void tcp_cwnd_validate(struct sock *sk, bool is_cwnd_limited) 
		if (tp->packets_out > tp->snd_cwnd_used)

			tp->snd_cwnd_used = tp->packets_out;



		if (sysctl_tcp_slow_start_after_idle &&

		if (sock_net(sk)->ipv4.sysctl_tcp_slow_start_after_idle &&

		    (s32)(tcp_jiffies32 - tp->snd_cwnd_stamp) >= inet_csk(sk)->icsk_rto &&

		    !ca_ops->cong_control)

			tcp_cwnd_application_limited(sk);