Commit 3e8db636 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-misc' 



Mat Martineau says:

====================
MPTCP: Miscellaneous changes

Here is a collection of patches from the MPTCP tree:

Patches 1 and 2 add some helpful MIB counters for connection
information.

Patch 3 cleans up some unnecessary checks.

Patch 4 is a new feature, support for the MP_TCPRST option. This option
is used when resetting one subflow within a MPTCP connection, and
provides a reason code that the recipient can use when deciding how to
adapt to the lost subflow.

Patches 5-7 update the existing MPTCP selftests to improve timeout
handling and to share better information when tests fail.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f3f409a9 c2a55e8f

include/net/mptcp.h

+16 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ struct mptcp_ext { 
			ack64:1,

			mpc_map:1,

			frozen:1,

			__unused:1;

	/* one byte hole */

			reset_transient:1;

	u8		reset_reason:4;

};



#define MPTCP_RM_IDS_MAX	8
@@ -58,6 +58,8 @@ struct mptcp_out_options { 
	struct mptcp_rm_list rm_list;

	u8 join_id;

	u8 backup;

	u8 reset_reason:4;

	u8 reset_transient:1;

	u32 nonce;

	u64 thmac;

	u32 token;
@@ -156,6 +158,16 @@ void mptcp_seq_show(struct seq_file *seq); 
int mptcp_subflow_init_cookie_req(struct request_sock *req,

				  const struct sock *sk_listener,

				  struct sk_buff *skb);



__be32 mptcp_get_reset_option(const struct sk_buff *skb);



static inline __be32 mptcp_reset_option(const struct sk_buff *skb)

{

	if (skb_ext_exist(skb, SKB_EXT_MPTCP))

		return mptcp_get_reset_option(skb);



	return htonl(0u);

}

#else



static inline void mptcp_init(void)
@@ -236,6 +248,8 @@ static inline int mptcp_subflow_init_cookie_req(struct request_sock *req, 
{

	return 0; /* TCP fallback */

}



static inline __be32 mptcp_reset_option(const struct sk_buff *skb)  { return htonl(0u); }

#endif /* CONFIG_MPTCP */



#if IS_ENABLED(CONFIG_MPTCP_IPV6)

include/uapi/linux/mptcp.h

+11 −0
Original line number Diff line number Diff line
@@ -174,10 +174,21 @@ enum mptcp_event_attr { 
	MPTCP_ATTR_FLAGS,	/* u16 */

	MPTCP_ATTR_TIMEOUT,	/* u32 */

	MPTCP_ATTR_IF_IDX,	/* s32 */

	MPTCP_ATTR_RESET_REASON,/* u32 */

	MPTCP_ATTR_RESET_FLAGS, /* u32 */



	__MPTCP_ATTR_AFTER_LAST

};



#define MPTCP_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1)



/* MPTCP Reset reason codes, rfc8684 */

#define MPTCP_RST_EUNSPEC	0

#define MPTCP_RST_EMPTCP	1

#define MPTCP_RST_ERESOURCE	2

#define MPTCP_RST_EPROHIBIT	3

#define MPTCP_RST_EWQ2BIG	4

#define MPTCP_RST_EBADPERF	5

#define MPTCP_RST_EMIDDLEBOX	6



#endif /* _UAPI_MPTCP_H */

net/ipv4/tcp_ipv4.c

+18 −3
Original line number Diff line number Diff line
@@ -655,14 +655,18 @@ EXPORT_SYMBOL(tcp_v4_send_check); 
 *	Exception: precedence violation. We do not implement it in any case.

 */



#ifdef CONFIG_TCP_MD5SIG

#define OPTION_BYTES TCPOLEN_MD5SIG_ALIGNED

#else

#define OPTION_BYTES sizeof(__be32)

#endif



static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)

{

	const struct tcphdr *th = tcp_hdr(skb);

	struct {

		struct tcphdr th;

#ifdef CONFIG_TCP_MD5SIG

		__be32 opt[(TCPOLEN_MD5SIG_ALIGNED >> 2)];

#endif

		__be32 opt[OPTION_BYTES / sizeof(__be32)];

	} rep;

	struct ip_reply_arg arg;

#ifdef CONFIG_TCP_MD5SIG
@@ -770,6 +774,17 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) 
				     ip_hdr(skb)->daddr, &rep.th);

	}

#endif

	/* Can't co-exist with TCPMD5, hence check rep.opt[0] */

	if (rep.opt[0] == 0) {

		__be32 mrst = mptcp_reset_option(skb);



		if (mrst) {

			rep.opt[0] = mrst;

			arg.iov[0].iov_len += sizeof(mrst);

			rep.th.doff = arg.iov[0].iov_len / 4;

		}

	}



	arg.csum = csum_tcpudp_nofold(ip_hdr(skb)->daddr,

				      ip_hdr(skb)->saddr, /* XXX */

				      arg.iov[0].iov_len, IPPROTO_TCP, 0);

net/ipv6/tcp_ipv6.c

+13 −1
Original line number Diff line number Diff line
@@ -879,8 +879,8 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 
	struct net *net = sk ? sock_net(sk) : dev_net(skb_dst(skb)->dev);

	struct sock *ctl_sk = net->ipv6.tcp_sk;

	unsigned int tot_len = sizeof(struct tcphdr);

	__be32 mrst = 0, *topt;

	struct dst_entry *dst;

	__be32 *topt;

	__u32 mark = 0;



	if (tsecr)
@@ -890,6 +890,15 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 
		tot_len += TCPOLEN_MD5SIG_ALIGNED;

#endif



#ifdef CONFIG_MPTCP

	if (rst && !key) {

		mrst = mptcp_reset_option(skb);



		if (mrst)

			tot_len += sizeof(__be32);

	}

#endif



	buff = alloc_skb(MAX_HEADER + sizeof(struct ipv6hdr) + tot_len,

			 GFP_ATOMIC);

	if (!buff)
@@ -920,6 +929,9 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 
		*topt++ = htonl(tsecr);

	}



	if (mrst)

		*topt++ = mrst;



#ifdef CONFIG_TCP_MD5SIG

	if (key) {

		*topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |

net/mptcp/mib.c

+3 −0
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ 


static const struct snmp_mib mptcp_snmp_list[] = {

	SNMP_MIB_ITEM("MPCapableSYNRX", MPTCP_MIB_MPCAPABLEPASSIVE),

	SNMP_MIB_ITEM("MPCapableSYNTX", MPTCP_MIB_MPCAPABLEACTIVE),

	SNMP_MIB_ITEM("MPCapableSYNACKRX", MPTCP_MIB_MPCAPABLEACTIVEACK),

	SNMP_MIB_ITEM("MPCapableACKRX", MPTCP_MIB_MPCAPABLEPASSIVEACK),

	SNMP_MIB_ITEM("MPCapableFallbackACK", MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK),

	SNMP_MIB_ITEM("MPCapableFallbackSYNACK", MPTCP_MIB_MPCAPABLEACTIVEFALLBACK),

	SNMP_MIB_ITEM("MPFallbackTokenInit", MPTCP_MIB_TOKENFALLBACKINIT),

	SNMP_MIB_ITEM("MPTCPRetrans", MPTCP_MIB_RETRANSSEGS),

	SNMP_MIB_ITEM("MPJoinNoTokenFound", MPTCP_MIB_JOINNOTOKEN),

	SNMP_MIB_ITEM("MPJoinSynRx", MPTCP_MIB_JOINSYNRX),