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

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

ipv4: Namespaceify tcp_fastopen knob 



Different namespace application might require enable TCP Fast Open
feature independently of the host.

This patch series continues making more of the TCP Fast Open related
sysctl knobs be per net-namespace.

Reported-by: default avatarLuca BRUNO <lucab@debian.org>
Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 506d0a3e

include/net/netns/ipv4.h

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

	int sysctl_tcp_timestamps;

	struct inet_timewait_death_row tcp_death_row;

	struct inet_timewait_death_row tcp_death_row;

	int sysctl_max_syn_backlog;

	int sysctl_max_syn_backlog;

	int sysctl_tcp_fastopen;





#ifdef CONFIG_NET_L3_MASTER_DEV

#ifdef CONFIG_NET_L3_MASTER_DEV

	int sysctl_udp_l3mdev_accept;

	int sysctl_udp_l3mdev_accept;

include/net/tcp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 








/* sysctl variables for tcp */

/* sysctl variables for tcp */

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;

extern int sysctl_tcp_stdurg;

extern int sysctl_tcp_rfc1337;

extern int sysctl_tcp_rfc1337;

net/ipv4/af_inet.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ int inet_listen(struct socket *sock, int backlog) 
{

{

	struct sock *sk = sock->sk;

	struct sock *sk = sock->sk;

	unsigned char old_state;

	unsigned char old_state;

	int err;

	int err, tcp_fastopen;





	lock_sock(sk);

	lock_sock(sk);
@@ -217,8 +217,9 @@ int inet_listen(struct socket *sock, int backlog) 
		 * because the socket was in TCP_LISTEN state previously but

		 * because the socket was in TCP_LISTEN state previously but

		 * was shutdown() rather than close().

		 * was shutdown() rather than close().

		 */

		 */

		if ((sysctl_tcp_fastopen & TFO_SERVER_WO_SOCKOPT1) &&

		tcp_fastopen = sock_net(sk)->ipv4.sysctl_tcp_fastopen;

		    (sysctl_tcp_fastopen & TFO_SERVER_ENABLE) &&

		if ((tcp_fastopen & TFO_SERVER_WO_SOCKOPT1) &&

		    (tcp_fastopen & TFO_SERVER_ENABLE) &&

		    !inet_csk(sk)->icsk_accept_queue.fastopenq.max_qlen) {

		    !inet_csk(sk)->icsk_accept_queue.fastopenq.max_qlen) {

			fastopen_queue_tune(sk, backlog);

			fastopen_queue_tune(sk, backlog);

			tcp_fastopen_init_key_once(true);

			tcp_fastopen_init_key_once(true);

net/ipv4/sysctl_net_ipv4.c

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

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec

	},

	},

	{

		.procname	= "tcp_fastopen",

		.data		= &sysctl_tcp_fastopen,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

	{

		.procname	= "tcp_fastopen_key",

		.procname	= "tcp_fastopen_key",

		.mode		= 0600,

		.mode		= 0600,
@@ -1085,6 +1078,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec

	},

	},

	{

		.procname	= "tcp_fastopen",

		.data		= &init_net.ipv4.sysctl_tcp_fastopen,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#ifdef CONFIG_IP_ROUTE_MULTIPATH

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	{

	{

		.procname	= "fib_multipath_use_neigh",

		.procname	= "fib_multipath_use_neigh",

net/ipv4/tcp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, 
	struct sockaddr *uaddr = msg->msg_name;

	struct sockaddr *uaddr = msg->msg_name;

	int err, flags;

	int err, flags;





	if (!(sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) ||

	if (!(sock_net(sk)->ipv4.sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) ||

	    (uaddr && msg->msg_namelen >= sizeof(uaddr->sa_family) &&

	    (uaddr && msg->msg_namelen >= sizeof(uaddr->sa_family) &&

	     uaddr->sa_family == AF_UNSPEC))

	     uaddr->sa_family == AF_UNSPEC))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;
@@ -2759,7 +2759,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, 
	case TCP_FASTOPEN_CONNECT:

	case TCP_FASTOPEN_CONNECT:

		if (val > 1 || val < 0) {

		if (val > 1 || val < 0) {

			err = -EINVAL;

			err = -EINVAL;

		} else if (sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) {

		} else if (net->ipv4.sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) {

			if (sk->sk_state == TCP_CLOSE)

			if (sk->sk_state == TCP_CLOSE)

				tp->fastopen_connect = val;

				tp->fastopen_connect = val;

			else

			else