summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2020-11-16 10:48:11 +0100
committerJakub Kicinski <kuba@kernel.org>2020-11-16 19:46:07 +0100
commit813e0a683d4cacb668622bc9a1693cb82b5f8ff8 (patch)
tree890cc2af3a16df0926cc7079d277d668d50349a8 /net
parentmptcp: move page frag allocation in mptcp_sendmsg() (diff)
downloadlinux-813e0a683d4cacb668622bc9a1693cb82b5f8ff8.tar.xz
linux-813e0a683d4cacb668622bc9a1693cb82b5f8ff8.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/mptcp/protocol.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 9b30c4b39159..821daa922ca3 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);