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

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

tcp: Namespace-ify sysctl_tcp_autocorking 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_min_tso_segs;

	int sysctl_tcp_min_rtt_wlen;

	int sysctl_tcp_autocorking;

	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
@@ -250,7 +250,6 @@ extern int sysctl_tcp_rmem[3]; 


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



extern int sysctl_tcp_autocorking;

extern int sysctl_tcp_invalid_ratelimit;

extern int sysctl_tcp_pacing_ss_ratio;

extern int sysctl_tcp_pacing_ca_ratio;

net/ipv4/sysctl_net_ipv4.c

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

		.extra2		= &thousand,

	},

	{

		.procname	= "tcp_autocorking",

		.data		= &sysctl_tcp_autocorking,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &zero,

		.extra2		= &one,

	},

	{

		.procname	= "tcp_invalid_ratelimit",

		.data		= &sysctl_tcp_invalid_ratelimit,
@@ -1145,6 +1136,15 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_autocorking",

		.data		= &init_net.ipv4.sysctl_tcp_autocorking,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &zero,

		.extra2		= &one,

	},

	{ }

};

net/ipv4/tcp.c

+1 −3
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ 


#include <trace/events/tcp.h>



int sysctl_tcp_autocorking __read_mostly = 1;



struct percpu_counter tcp_orphan_count;

EXPORT_SYMBOL_GPL(tcp_orphan_count);
@@ -697,7 +695,7 @@ static bool tcp_should_autocork(struct sock *sk, struct sk_buff *skb, 
				int size_goal)

{

	return skb->len < size_goal &&

	       sysctl_tcp_autocorking &&

	       sock_net(sk)->ipv4.sysctl_tcp_autocorking &&

	       skb != tcp_write_queue_head(sk) &&

	       refcount_read(&sk->sk_wmem_alloc) > skb->truesize;

}

net/ipv4/tcp_ipv4.c

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

	net->ipv4.sysctl_tcp_min_tso_segs = 2;

	net->ipv4.sysctl_tcp_min_rtt_wlen = 300;

	net->ipv4.sysctl_tcp_autocorking = 1;



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);