Revert "mptcp: Handle fallback while meta is closed"

This reverts commit 7ea6f5f. This was not correct to do the check in mptcp_sub_force_close_all(). Only some of these calls should have this checks, not the one sending the active reset for example. Signed-off-by: Matthieu Baerts <[email protected]>
multipath-tcp · Apr 2, 2022 · 08c571d · 08c571d
1 parent 7ea6f5f
commit 08c571d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
@@ -984,12 +984,6 @@ static inline void mptcp_sub_force_close_all(struct mptcp_cb *mpcb,
 {
 	struct sock *sk_it, *tmp;
 
-	/* It can happen that the meta is already closed. In that case, don't
-	 * keep the subflow alive - close everything!
-	 */
-	if (mpcb->meta_sk->sk_state == TCP_CLOSE)
-		except = NULL;
-
 	mptcp_for_each_sk_safe(mpcb, sk_it, tmp) {
 		if (sk_it != except)
 			mptcp_send_reset(sk_it);

diff --git a/net/mptcp/mptcp_input.c b/net/mptcp/mptcp_input.c
@@ -1623,11 +1623,11 @@ bool mptcp_handle_ack_in_infinite(struct sock *sk, const struct sk_buff *skb,
 	if (!(flag & MPTCP_FLAG_DATA_ACKED))
 		return false;
 
-	pr_debug("%s %#x will fallback - pi %d, src %pI4:%u dst %pI4:%u rcv_nxt %u\n",
+	pr_debug("%s %#x will fallback - pi %d, src %pI4:%u dst %pI4:%u rcv_nxt %u from %pS\n",
 		 __func__, mpcb->mptcp_loc_token, tp->mptcp->path_index,
 		 &inet_sk(sk)->inet_saddr, ntohs(inet_sk(sk)->inet_sport),
 		 &inet_sk(sk)->inet_daddr, ntohs(inet_sk(sk)->inet_dport),
-		 tp->rcv_nxt);
+		 tp->rcv_nxt, __builtin_return_address(0));
 	if (!is_master_tp(tp)) {
 		MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_FBACKSUB);
 		return true;