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

Commit 56ab6b93 authored by Haishuang Yan's avatar Haishuang Yan Committed by David S. Miller
Browse files

ipv4: Namespaceify tcp_tw_reuse knob 



Different namespaces might have different requirements to reuse
TIME-WAIT sockets for new connections. This might be required in
cases where different namespace applications are in place which
require TIME_WAIT socket connections to be reduced independently
of the host.

Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e6afb1ad

include/net/netns/ipv4.h

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

	int sysctl_tcp_fin_timeout;

	unsigned int sysctl_tcp_notsent_lowat;

	int sysctl_tcp_tw_reuse;



	int sysctl_igmp_max_memberships;

	int sysctl_igmp_max_msf;

include/net/tcp.h

+0 −1
Original line number Diff line number Diff line
@@ -252,7 +252,6 @@ extern int sysctl_tcp_wmem[3]; 
extern int sysctl_tcp_rmem[3];

extern int sysctl_tcp_app_win;

extern int sysctl_tcp_adv_win_scale;

extern int sysctl_tcp_tw_reuse;

extern int sysctl_tcp_frto;

extern int sysctl_tcp_low_latency;

extern int sysctl_tcp_nometrics_save;

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -432,13 +432,6 @@ static struct ctl_table ipv4_table[] = { 
		.extra1		= &tcp_adv_win_scale_min,

		.extra2		= &tcp_adv_win_scale_max,

	},

	{

		.procname	= "tcp_tw_reuse",

		.data		= &sysctl_tcp_tw_reuse,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_frto",

		.data		= &sysctl_tcp_frto,
@@ -960,6 +953,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_tw_reuse",

		.data		= &init_net.ipv4.sysctl_tcp_tw_reuse,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	{

		.procname	= "fib_multipath_use_neigh",

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 
#include <crypto/hash.h>

#include <linux/scatterlist.h>



int sysctl_tcp_tw_reuse __read_mostly;

int sysctl_tcp_low_latency __read_mostly;



#ifdef CONFIG_TCP_MD5SIG
@@ -120,7 +119,7 @@ int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp) 
	   and use initial timestamp retrieved from peer table.

	 */

	if (tcptw->tw_ts_recent_stamp &&

	    (!twp || (sysctl_tcp_tw_reuse &&

	    (!twp || (sock_net(sk)->ipv4.sysctl_tcp_tw_reuse &&

			     get_seconds() - tcptw->tw_ts_recent_stamp > 1))) {

		tp->write_seq = tcptw->tw_snd_nxt + 65535 + 2;

		if (tp->write_seq == 0)
@@ -2456,6 +2455,7 @@ static int __net_init tcp_sk_init(struct net *net) 
	net->ipv4.sysctl_tcp_orphan_retries = 0;

	net->ipv4.sysctl_tcp_fin_timeout = TCP_FIN_TIMEOUT;

	net->ipv4.sysctl_tcp_notsent_lowat = UINT_MAX;

	net->ipv4.sysctl_tcp_tw_reuse = 0;



	return 0;

fail: