From: Paolo Abeni <pabeni@redhat.com>
Date: Mon, 16 Nov 2020 09:48:11 +0000 (+0100)
Subject: mptcp: try to push pending data on snd una updates
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=813e0a683d4cacb668622bc9a1693cb82b5f8ff8;p=linux.git

mptcp: try to push pending data on snd una updates

After the previous patch we may end-up with unsent data
in the write buffer. If such buffer is full, the writer
will block for unlimited time.

We need to trigger the MPTCP xmit path even for the
subflow rx path, on MPTCP snd_una updates.

Keep things simple and just schedule the work queue if
needed.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 9b30c4b39159f..821daa922ca3e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -725,6 +725,7 @@ void mptcp_data_acked(struct sock *sk)
 	mptcp_reset_timer(sk);
 
 	if ((!test_bit(MPTCP_SEND_SPACE, &mptcp_sk(sk)->flags) ||
+	     mptcp_send_head(sk) ||
 	     (inet_sk_state_load(sk) != TCP_ESTABLISHED)))
 		mptcp_schedule_work(sk);
 }
@@ -1840,6 +1841,8 @@ static void mptcp_worker(struct work_struct *work)
 		__mptcp_close_subflow(msk);
 
 	__mptcp_move_skbs(msk);
+	if (mptcp_send_head(sk))
+		mptcp_push_pending(sk, 0);
 
 	if (msk->pm.status)
 		pm_work(msk);