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

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

tcp: Namespace-ify sysctl_tcp_adv_win_scale 



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

include/net/netns/ipv4.h

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

	int sysctl_tcp_dsack;

	int sysctl_tcp_app_win;

	int sysctl_tcp_adv_win_scale;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;

include/net/tcp.h

+4 −5
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_adv_win_scale;

extern int sysctl_tcp_frto;

extern int sysctl_tcp_nometrics_save;

extern int sysctl_tcp_moderate_rcvbuf;
@@ -1311,9 +1310,9 @@ void tcp_select_initial_window(int __space, __u32 mss, __u32 *rcv_wnd, 
			       __u32 *window_clamp, int wscale_ok,

			       __u8 *rcv_wscale, __u32 init_rcv_wnd);



static inline int tcp_win_from_space(int space)

static inline int tcp_win_from_space(const struct sock *sk, int space)

{

	int tcp_adv_win_scale = sysctl_tcp_adv_win_scale;

	int tcp_adv_win_scale = sock_net(sk)->ipv4.sysctl_tcp_adv_win_scale;



	return tcp_adv_win_scale <= 0 ?

		(space>>(-tcp_adv_win_scale)) :
@@ -1323,13 +1322,13 @@ static inline int tcp_win_from_space(int space) 
/* Note: caller must be prepared to deal with negative returns */

static inline int tcp_space(const struct sock *sk)

{

	return tcp_win_from_space(sk->sk_rcvbuf -

	return tcp_win_from_space(sk, sk->sk_rcvbuf -

				  atomic_read(&sk->sk_rmem_alloc));

}



static inline int tcp_full_space(const struct sock *sk)

{

	return tcp_win_from_space(sk->sk_rcvbuf);

	return tcp_win_from_space(sk, sk->sk_rcvbuf);

}



extern void tcp_openreq_init_rwin(struct request_sock *req,

net/ipv4/sysctl_net_ipv4.c

+9 −9
Original line number Diff line number Diff line
@@ -437,15 +437,6 @@ static struct ctl_table ipv4_table[] = { 
		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &one,

	},

	{

		.procname	= "tcp_adv_win_scale",

		.data		= &sysctl_tcp_adv_win_scale,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_adv_win_scale_min,

		.extra2		= &tcp_adv_win_scale_max,

	},

	{

		.procname	= "tcp_frto",

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

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_adv_win_scale",

		.data		= &init_net.ipv4.sysctl_tcp_adv_win_scale,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &tcp_adv_win_scale_min,

		.extra2		= &tcp_adv_win_scale_max,

	},

	{ }

};

net/ipv4/tcp_input.c

+5 −8
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ 
#include <linux/unaligned/access_ok.h>

#include <linux/static_key.h>



int sysctl_tcp_adv_win_scale __read_mostly = 1;

EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);



/* rfc5961 challenge ack rate limiting */

int sysctl_tcp_challenge_ack_limit = 1000;
@@ -363,8 +360,8 @@ static int __tcp_grow_window(const struct sock *sk, const struct sk_buff *skb) 
{

	struct tcp_sock *tp = tcp_sk(sk);

	/* Optimize this! */

	int truesize = tcp_win_from_space(skb->truesize) >> 1;

	int window = tcp_win_from_space(sysctl_tcp_rmem[2]) >> 1;

	int truesize = tcp_win_from_space(sk, skb->truesize) >> 1;

	int window = tcp_win_from_space(sk, sysctl_tcp_rmem[2]) >> 1;



	while (tp->rcv_ssthresh <= window) {

		if (truesize <= skb->len)
@@ -389,7 +386,7 @@ static void tcp_grow_window(struct sock *sk, const struct sk_buff *skb) 
		/* Check #2. Increase window, if skb with such overhead

		 * will fit to rcvbuf in future.

		 */

		if (tcp_win_from_space(skb->truesize) <= skb->len)

		if (tcp_win_from_space(sk, skb->truesize) <= skb->len)

			incr = 2 * tp->advmss;

		else

			incr = __tcp_grow_window(sk, skb);
@@ -630,7 +627,7 @@ void tcp_rcv_space_adjust(struct sock *sk) 
		}



		rcvmem = SKB_TRUESIZE(tp->advmss + MAX_TCP_HEADER);

		while (tcp_win_from_space(rcvmem) < tp->advmss)

		while (tcp_win_from_space(sk, rcvmem) < tp->advmss)

			rcvmem += 128;



		rcvbuf = min(rcvwin / tp->advmss * rcvmem, sysctl_tcp_rmem[2]);
@@ -4809,7 +4806,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root, 
		 *   overlaps to the next one.

		 */

		if (!(TCP_SKB_CB(skb)->tcp_flags & (TCPHDR_SYN | TCPHDR_FIN)) &&

		    (tcp_win_from_space(skb->truesize) > skb->len ||

		    (tcp_win_from_space(sk, skb->truesize) > skb->len ||

		     before(TCP_SKB_CB(skb)->seq, start))) {

			end_of_skbs = false;

			break;

net/ipv4/tcp_ipv4.c

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

	net->ipv4.sysctl_tcp_dsack = 1;

	net->ipv4.sysctl_tcp_app_win = 31;

	net->ipv4.sysctl_tcp_adv_win_scale = 1;



	net->ipv4.sysctl_tcp_fastopen = TFO_CLIENT_ENABLE;

	spin_lock_init(&net->ipv4.tcp_fastopen_ctx_lock);