From: Florian Westphal <fw@strlen.de>
Date: Thu, 19 Nov 2020 19:45:56 +0000 (-0800)
Subject: mptcp: skip to next candidate if subflow has unacked data
X-Git-Tag: v5.11-rc1~169^2~204^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=860975c6f80adae9d2c7654bde04a99dd28bc94f;p=thirdparty%2Flinux.git

mptcp: skip to next candidate if subflow has unacked data

In case a subflow path is blocked, MPTCP-level retransmit may not take
place anymore because such subflow is likely to have unacked data left
in its write queue.

Ignore subflows that have experienced loss and test next candidate.

Fixes: 3b1d6210a95773691 ("mptcp: implement and use MPTCP-level retransmission")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2d450865937d5..868c76cf0f150 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1726,8 +1726,11 @@ static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk)
 			continue;
 
 		/* still data outstanding at TCP level?  Don't retransmit. */
-		if (!tcp_write_queue_empty(ssk))
+		if (!tcp_write_queue_empty(ssk)) {
+			if (inet_csk(ssk)->icsk_ca_state >= TCP_CA_Loss)
+				continue;
 			return NULL;
+		}
 
 		if (subflow->backup) {
 			if (!backup)