Commit 049fe386 authored by Florian Westphal's avatar Florian Westphal Committed by Jakub Kicinski
Browse files

tcp: parse mptcp options contained in reset packets 



Because TCP-level resets only affect the subflow, there is a MPTCP
option to indicate that the MPTCP-level connection should be closed
immediately without a mptcp-level fin exchange.

This is the 'MPTCP fast close option'.  It can be carried on ack
segments or TCP resets.  In the latter case, its needed to parse mptcp
options also for reset packets so that MPTCP can act accordingly.

Next patch will add receive side fastclose support in MPTCP.

Acked-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ab82e996

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ void tcp_skb_collapse_tstamp(struct sk_buff *skb, 
/* tcp_input.c */

void tcp_rearm_rto(struct sock *sk);

void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req);

void tcp_reset(struct sock *sk);

void tcp_reset(struct sock *sk, struct sk_buff *skb);

void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb);

void tcp_fin(struct sock *sk);

net/ipv4/tcp_input.c

+8 −5
Original line number Diff line number Diff line
@@ -4218,10 +4218,13 @@ static inline bool tcp_sequence(const struct tcp_sock *tp, u32 seq, u32 end_seq) 
}



/* When we get a reset we do this. */

void tcp_reset(struct sock *sk)

void tcp_reset(struct sock *sk, struct sk_buff *skb)

{

	trace_tcp_receive_reset(sk);



	if (sk_is_mptcp(sk))

		mptcp_incoming_options(sk, skb);



	/* We want the right error as BSD sees it (and indeed as we do). */

	switch (sk->sk_state) {

	case TCP_SYN_SENT:
@@ -5604,7 +5607,7 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, 
						  &tp->last_oow_ack_time))

				tcp_send_dupack(sk, skb);

		} else if (tcp_reset_check(sk, skb)) {

			tcp_reset(sk);

			tcp_reset(sk, skb);

		}

		goto discard;

	}
@@ -5640,7 +5643,7 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, 
		}



		if (rst_seq_match)

			tcp_reset(sk);

			tcp_reset(sk, skb);

		else {

			/* Disable TFO if RST is out-of-order

			 * and no data has been received
@@ -6077,7 +6080,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
		 */



		if (th->rst) {

			tcp_reset(sk);

			tcp_reset(sk, skb);

			goto discard;

		}
@@ -6519,7 +6522,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) 
			if (TCP_SKB_CB(skb)->end_seq != TCP_SKB_CB(skb)->seq &&

			    after(TCP_SKB_CB(skb)->end_seq - th->fin, tp->rcv_nxt)) {

				NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONDATA);

				tcp_reset(sk);

				tcp_reset(sk, skb);

				return 1;

			}

		}

net/ipv4/tcp_minisocks.c

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ embryonic_reset: 
		req->rsk_ops->send_reset(sk, skb);

	} else if (fastopen) { /* received a valid RST pkt */

		reqsk_fastopen_remove(sk, req, true);

		tcp_reset(sk);

		tcp_reset(sk, skb);

	}

	if (!fastopen) {

		inet_csk_reqsk_queue_drop(sk, req);

CRA Git | Maintained and supported by SUSTech CRA and CCSE