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

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

tcp: Namespaceify sysctl_tcp_sack 



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

include/net/netns/ipv4.h

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

	unsigned int sysctl_tcp_notsent_lowat;

	int sysctl_tcp_tw_reuse;

	int sysctl_tcp_sack;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 
/* sysctl variables for tcp */

extern int sysctl_tcp_timestamps;

extern int sysctl_tcp_window_scaling;

extern int sysctl_tcp_sack;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;
@@ -520,7 +519,8 @@ u32 __cookie_v4_init_sequence(const struct iphdr *iph, const struct tcphdr *th, 
			      u16 *mssp);

__u32 cookie_v4_init_sequence(const struct sk_buff *skb, __u16 *mss);

u64 cookie_init_timestamp(struct request_sock *req);

bool cookie_timestamp_decode(struct tcp_options_received *opt);

bool cookie_timestamp_decode(const struct net *net,

			     struct tcp_options_received *opt);

bool cookie_ecn_ok(const struct tcp_options_received *opt,

		   const struct net *net, const struct dst_entry *dst);

net/ipv4/syncookies.c

+4 −3
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ EXPORT_SYMBOL(tcp_get_cookie_sock); 
 * return false if we decode a tcp option that is disabled

 * on the host.

 */

bool cookie_timestamp_decode(struct tcp_options_received *tcp_opt)

bool cookie_timestamp_decode(const struct net *net,

			     struct tcp_options_received *tcp_opt)

{

	/* echoed timestamp, lowest bits contain options */

	u32 options = tcp_opt->rcv_tsecr;
@@ -247,7 +248,7 @@ bool cookie_timestamp_decode(struct tcp_options_received *tcp_opt) 


	tcp_opt->sack_ok = (options & TS_OPT_SACK) ? TCP_SACK_SEEN : 0;



	if (tcp_opt->sack_ok && !sysctl_tcp_sack)

	if (tcp_opt->sack_ok && !net->ipv4.sysctl_tcp_sack)

		return false;



	if ((options & TS_OPT_WSCALE_MASK) == TS_OPT_WSCALE_MASK)
@@ -319,7 +320,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb) 
		tcp_opt.rcv_tsecr -= tsoff;

	}



	if (!cookie_timestamp_decode(&tcp_opt))

	if (!cookie_timestamp_decode(sock_net(sk), &tcp_opt))

		goto out;



	ret = NULL;

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_sack",

		.data		= &sysctl_tcp_sack,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_retrans_collapse",

		.data		= &sysctl_tcp_retrans_collapse,
@@ -1116,6 +1109,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.extra2		= &one,

	},

#endif

	{

		.procname	= "tcp_sack",

		.data		= &init_net.ipv4.sysctl_tcp_sack,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp_input.c

+1 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 


int sysctl_tcp_timestamps __read_mostly = 1;

int sysctl_tcp_window_scaling __read_mostly = 1;

int sysctl_tcp_sack __read_mostly = 1;

int sysctl_tcp_fack __read_mostly;

int sysctl_tcp_max_reordering __read_mostly = 300;

int sysctl_tcp_dsack __read_mostly = 1;
@@ -3790,7 +3789,7 @@ void tcp_parse_options(const struct net *net, 
				break;

			case TCPOPT_SACK_PERM:

				if (opsize == TCPOLEN_SACK_PERM && th->syn &&

				    !estab && sysctl_tcp_sack) {

				    !estab && net->ipv4.sysctl_tcp_sack) {

					opt_rx->sack_ok = TCP_SACK_SEEN;

					tcp_sack_reset(opt_rx);

				}