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

Commit 1043e25f authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespaceify tcp reordering sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 12ed8244

include/net/netns/ipv4.h

+1 −1
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ struct netns_ipv4 { 


	int sysctl_tcp_syn_retries;

	int sysctl_tcp_synack_retries;



	int sysctl_tcp_syncookies;

	int sysctl_tcp_reordering;



	struct ping_group_range ping_group_range;

include/net/tcp.h

+3 −1
Original line number Diff line number Diff line
@@ -961,9 +961,11 @@ static inline void tcp_enable_fack(struct tcp_sock *tp) 
 */

static inline void tcp_enable_early_retrans(struct tcp_sock *tp)

{

	struct net *net = sock_net((struct sock *)tp);



	tp->do_early_retrans = sysctl_tcp_early_retrans &&

		sysctl_tcp_early_retrans < 4 && !sysctl_tcp_thin_dupack &&

		sysctl_tcp_reordering == 3;

		net->ipv4.sysctl_tcp_reordering == 3;

}



static inline void tcp_disable_early_retrans(struct tcp_sock *tp)

net/ipv4/sysctl_net_ipv4.c

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

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_reordering",

		.data		= &sysctl_tcp_reordering,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_max_reordering",

		.data		= &sysctl_tcp_max_reordering,
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.proc_handler	= proc_dointvec

	},

#endif

	{

		.procname	= "tcp_reordering",

		.data		= &init_net.ipv4.sysctl_tcp_reordering,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{ }

};

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void tcp_init_sock(struct sock *sk) 
	tp->mss_cache = TCP_MSS_DEFAULT;

	u64_stats_init(&tp->syncp);



	tp->reordering = sysctl_tcp_reordering;

	tp->reordering = sock_net(sk)->ipv4.sysctl_tcp_reordering;

	tcp_enable_early_retrans(tp);

	tcp_assign_congestion_control(sk);

net/ipv4/tcp_input.c

+6 −6
Original line number Diff line number Diff line
@@ -80,9 +80,7 @@ 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 = 1;

int sysctl_tcp_reordering __read_mostly = TCP_FASTRETRANS_THRESH;

int sysctl_tcp_max_reordering __read_mostly = 300;

EXPORT_SYMBOL(sysctl_tcp_reordering);

int sysctl_tcp_dsack __read_mostly = 1;

int sysctl_tcp_app_win __read_mostly = 31;

int sysctl_tcp_adv_win_scale __read_mostly = 1;
@@ -1883,6 +1881,7 @@ void tcp_enter_loss(struct sock *sk) 
{

	const struct inet_connection_sock *icsk = inet_csk(sk);

	struct tcp_sock *tp = tcp_sk(sk);

	struct net *net = sock_net(sk);

	struct sk_buff *skb;

	bool new_recovery = icsk->icsk_ca_state < TCP_CA_Recovery;

	bool is_reneg;			/* is receiver reneging on SACKs? */
@@ -1933,9 +1932,9 @@ void tcp_enter_loss(struct sock *sk) 
	 * suggests that the degree of reordering is over-estimated.

	 */

	if (icsk->icsk_ca_state <= TCP_CA_Disorder &&

	    tp->sacked_out >= sysctl_tcp_reordering)

	    tp->sacked_out >= net->ipv4.sysctl_tcp_reordering)

		tp->reordering = min_t(unsigned int, tp->reordering,

				       sysctl_tcp_reordering);

				       net->ipv4.sysctl_tcp_reordering);

	tcp_set_ca_state(sk, TCP_CA_Loss);

	tp->high_seq = tp->snd_nxt;

	tcp_ecn_queue_cwr(tp);
@@ -2119,6 +2118,7 @@ static bool tcp_time_to_recover(struct sock *sk, int flag) 
{

	struct tcp_sock *tp = tcp_sk(sk);

	__u32 packets_out;

	int tcp_reordering = sock_net(sk)->ipv4.sysctl_tcp_reordering;



	/* Trick#1: The loss is proven. */

	if (tp->lost_out)
@@ -2133,7 +2133,7 @@ static bool tcp_time_to_recover(struct sock *sk, int flag) 
	 */

	packets_out = tp->packets_out;

	if (packets_out <= tp->reordering &&

	    tp->sacked_out >= max_t(__u32, packets_out/2, sysctl_tcp_reordering) &&

	    tp->sacked_out >= max_t(__u32, packets_out/2, tcp_reordering) &&

	    !tcp_may_send_now(sk)) {

		/* We have nothing to send. This connection is limited

		 * either by receiver window or by application.
@@ -3317,7 +3317,7 @@ static inline bool tcp_may_raise_cwnd(const struct sock *sk, const int flag) 
	 * new SACK or ECE mark may first advance cwnd here and later reduce

	 * cwnd in tcp_fastretrans_alert() based on more states.

	 */

	if (tcp_sk(sk)->reordering > sysctl_tcp_reordering)

	if (tcp_sk(sk)->reordering > sock_net(sk)->ipv4.sysctl_tcp_reordering)

		return flag & FLAG_FORWARD_PROGRESS;



	return flag & FLAG_DATA_ACKED;