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

Commit 2100c8d2 authored by Yuchung Cheng's avatar Yuchung Cheng Committed by David S. Miller
Browse files

net-tcp: Fast Open base 



This patch impelements the common code for both the client and server.

1. TCP Fast Open option processing. Since Fast Open does not have an
   option number assigned by IANA yet, it shares the experiment option
   code 254 by implementing draft-ietf-tcpm-experimental-options
   with a 16 bits magic number 0xF989. This enables global experiments
   without clashing the scarce(2) experimental options available for TCP.

   When the draft status becomes standard (maybe), the client should
   switch to the new option number assigned while the server supports
   both numbers for transistion.

2. The new sysctl tcp_fastopen

3. A place holder init function

Signed-off-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cce66cd

include/linux/tcp.h

+10 −0
Original line number Diff line number Diff line
@@ -243,6 +243,16 @@ static inline unsigned int tcp_optlen(const struct sk_buff *skb) 
	return (tcp_hdr(skb)->doff - 5) * 4;

}



/* TCP Fast Open */

#define TCP_FASTOPEN_COOKIE_MIN	4	/* Min Fast Open Cookie size in bytes */

#define TCP_FASTOPEN_COOKIE_MAX	16	/* Max Fast Open Cookie size in bytes */



/* TCP Fast Open Cookie as stored in memory */

struct tcp_fastopen_cookie {

	s8	len;

	u8	val[TCP_FASTOPEN_COOKIE_MAX];

};



/* This defines a selective acknowledgement block. */

struct tcp_sack_block_wire {

	__be32	start_seq;

include/net/tcp.h

+8 −1
Original line number Diff line number Diff line
@@ -170,6 +170,11 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); 
#define TCPOPT_TIMESTAMP	8	/* Better RTT estimations/PAWS */

#define TCPOPT_MD5SIG		19	/* MD5 Signature (RFC2385) */

#define TCPOPT_COOKIE		253	/* Cookie extension (experimental) */

#define TCPOPT_EXP		254	/* Experimental */

/* Magic number to be after the option value for sharing TCP

 * experimental options. See draft-ietf-tcpm-experimental-options-00.txt

 */

#define TCPOPT_FASTOPEN_MAGIC	0xF989



/*

 *     TCP option lengths
@@ -180,6 +185,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo); 
#define TCPOLEN_SACK_PERM      2

#define TCPOLEN_TIMESTAMP      10

#define TCPOLEN_MD5SIG         18

#define TCPOLEN_EXP_FASTOPEN_BASE  4

#define TCPOLEN_COOKIE_BASE    2	/* Cookie-less header extension */

#define TCPOLEN_COOKIE_PAIR    3	/* Cookie pair header extension */

#define TCPOLEN_COOKIE_MIN     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MIN)
@@ -222,6 +228,7 @@ extern int sysctl_tcp_retries1; 
extern int sysctl_tcp_retries2;

extern int sysctl_tcp_orphan_retries;

extern int sysctl_tcp_syncookies;

extern int sysctl_tcp_fastopen;

extern int sysctl_tcp_retrans_collapse;

extern int sysctl_tcp_stdurg;

extern int sysctl_tcp_rfc1337;
@@ -418,7 +425,7 @@ extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		       size_t len, int nonblock, int flags, int *addr_len);

extern void tcp_parse_options(const struct sk_buff *skb,

			      struct tcp_options_received *opt_rx, const u8 **hvpp,

			      int estab);

			      int estab, struct tcp_fastopen_cookie *foc);

extern const u8 *tcp_parse_md5sig_option(const struct tcphdr *th);



/*

net/ipv4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-y := route.o inetpeer.o protocol.o \ 
	     ip_output.o ip_sockglue.o inet_hashtables.o \

	     inet_timewait_sock.o inet_connection_sock.o \

	     tcp.o tcp_input.o tcp_output.o tcp_timer.o tcp_ipv4.o \

	     tcp_minisocks.o tcp_cong.o tcp_metrics.o \

	     tcp_minisocks.o tcp_cong.o tcp_metrics.o tcp_fastopen.o \

	     datagram.o raw.o udp.o udplite.o \

	     arp.o icmp.o devinet.o af_inet.o  igmp.o \

	     fib_frontend.o fib_semantics.o fib_trie.o \

net/ipv4/syncookies.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, 


	/* check for timestamp cookie support */

	memset(&tcp_opt, 0, sizeof(tcp_opt));

	tcp_parse_options(skb, &tcp_opt, &hash_location, 0);

	tcp_parse_options(skb, &tcp_opt, &hash_location, 0, NULL);



	if (!cookie_check_timestamp(&tcp_opt, &ecn_ok))

		goto out;

net/ipv4/sysctl_net_ipv4.c

+7 −0
Original line number Diff line number Diff line
@@ -366,6 +366,13 @@ static struct ctl_table ipv4_table[] = { 
		.proc_handler	= proc_dointvec

	},

#endif

	{

		.procname	= "tcp_fastopen",

		.data		= &sysctl_tcp_fastopen,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

	{

		.procname	= "tcp_tw_recycle",

		.data		= &tcp_death_row.sysctl_tw_recycle,