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

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

tcp: Namespace-ify sysctl_tcp_tso_win_divisor 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_nometrics_save;

	int sysctl_tcp_moderate_rcvbuf;

	int sysctl_tcp_tso_win_divisor;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ extern int sysctl_tcp_max_orphans; 
extern long sysctl_tcp_mem[3];

extern int sysctl_tcp_wmem[3];

extern int sysctl_tcp_rmem[3];

extern int sysctl_tcp_tso_win_divisor;

extern int sysctl_tcp_workaround_signed_windows;



#define TCP_RACK_LOSS_DETECTION  0x1 /* Use RACK to detect losses */

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_tso_win_divisor",

		.data		= &sysctl_tcp_tso_win_divisor,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_congestion_control",

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

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_tso_win_divisor",

		.data		= &init_net.ipv4.sysctl_tcp_tso_win_divisor,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{ }

};

net/ipv4/tcp_ipv4.c

+5 −0
Original line number Diff line number Diff line
@@ -2494,6 +2494,11 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_adv_win_scale = 1;

	net->ipv4.sysctl_tcp_frto = 2;

	net->ipv4.sysctl_tcp_moderate_rcvbuf = 1;

	/* This limits the percentage of the congestion window which we

	 * will allow a single TSO frame to consume.  Building TSO frames

	 * which are too large can cause TCP streams to be bursty.

	 */

	net->ipv4.sysctl_tcp_tso_win_divisor = 3;



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);

net/ipv4/tcp_output.c

+1 −7
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ int sysctl_tcp_workaround_signed_windows __read_mostly = 0; 
/* Default TSQ limit of four TSO segments */

int sysctl_tcp_limit_output_bytes __read_mostly = 262144;



/* This limits the percentage of the congestion window which we

 * will allow a single TSO frame to consume.  Building TSO frames

 * which are too large can cause TCP streams to be bursty.

 */

int sysctl_tcp_tso_win_divisor __read_mostly = 3;



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

			   int push_one, gfp_t gfp);
@@ -1988,7 +1982,7 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb, 
	if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len))

		goto send_now;



	win_divisor = ACCESS_ONCE(sysctl_tcp_tso_win_divisor);

	win_divisor = ACCESS_ONCE(sock_net(sk)->ipv4.sysctl_tcp_tso_win_divisor);

	if (win_divisor) {

		u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);