diff options
| author |   Florian Westphal <fw@strlen.de> | 2020-11-19 11:45:56 -0800 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2020-11-20 15:33:24 -0800 |
| commit | 860975c6f80adae9d2c7654bde04a99dd28bc94f (patch) | |
| tree | 4de856b0725ce1c5d410bae43eab7ec82c9e2fa6 /net | |
| parent | mptcp: fix state tracking for fallback socket (diff) | |
| download | linux-dev-860975c6f80adae9d2c7654bde04a99dd28bc94f.tar.xz linux-dev-860975c6f80adae9d2c7654bde04a99dd28bc94f.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mptcp/protocol.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2d450865937d..868c76cf0f15 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) |