net: namespaceify sysctl_tcp_no_delay_ack

isolate sysctl_tcp_no_delay_ack as net namespace Signed-off-by: Hongbo Li <herberthbli@tencent.com>
Tencent · Jan 2, 2020 · 26fb4c4 · 26fb4c4
1 parent 78a8c3c
commit 26fb4c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
@@ -160,6 +160,8 @@ struct netns_ipv4 {
 	int sysctl_fib_multipath_hash_policy;
 #endif
 
+	int sysctl_tcp_no_delay_ack;
+
 	struct fib_notifier_ops	*notifier_ops;
 	unsigned int	fib_seq;	/* protected by rtnl_mutex */
 

diff --git a/include/net/tcp.h b/include/net/tcp.h
@@ -277,7 +277,6 @@ extern int sysctl_tcp_pacing_ss_ratio;
 extern int sysctl_tcp_pacing_ca_ratio;
 extern int sysctl_tcp_tw_ignore_syn_tsval_zero;
 extern int sysctl_tcp_loss_init_cwnd;
-extern int sysctl_tcp_no_delay_ack;
 extern int sysctl_tcp_init_cwnd;
 
 extern atomic_long_t tcp_memory_allocated;

diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
@@ -746,13 +746,6 @@ static struct ctl_table ipv4_table[] = {
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= &zero,
 	},
-	{
-		.procname	= "tcp_no_delay_ack",
-		.data		= &sysctl_tcp_no_delay_ack,
-		.maxlen		= sizeof(int),
-		.mode		= 0644,
-		.proc_handler	= proc_dointvec,
-	},
 	{
 		.procname	= "tcp_init_cwnd",
 		.data		= &sysctl_tcp_init_cwnd,
@@ -1183,6 +1176,13 @@ static struct ctl_table ipv4_net_table[] = {
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec
 	},
+	{
+		.procname   = "tcp_no_delay_ack",
+		.data       = &init_net.ipv4.sysctl_tcp_no_delay_ack,
+		.maxlen     = sizeof(int),
+		.mode       = 0644,
+		.proc_handler   = proc_dointvec
+	},
 	{ }
 };
 

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
@@ -97,7 +97,6 @@ int sysctl_tcp_early_retrans __read_mostly = 3;
 int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
 int sysctl_tcp_tw_ignore_syn_tsval_zero __read_mostly = 1;
 int sysctl_tcp_loss_init_cwnd = 1;
-int sysctl_tcp_no_delay_ack = 0;
 int sysctl_tcp_init_cwnd = TCP_INIT_CWND;
 
 #define FLAG_DATA		0x01 /* Incoming frame contained data.		*/
@@ -5123,8 +5122,8 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
 	     __tcp_select_window(sk) >= tp->rcv_wnd) ||
 	    /* We ACK each frame or... */
 	    tcp_in_quickack_mode(sk) ||
-		/* We need to send ack no delay or ... */
-		sysctl_tcp_no_delay_ack ||
+	    /* We need to send ack no delay or ... */
+	    sock_net(sk)->ipv4.sysctl_tcp_no_delay_ack ||
 	    /* We have out of order data. */
 	    (ofo_possible && !RB_EMPTY_ROOT(&tp->out_of_order_queue))) {
 		/* Then ack it now */