Commit 813e0a68 authored Nov 16, 2020 by Paolo Abeni Committed by Jakub Kicinski Nov 16, 2020

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>

parent d9ca1de8

net/mptcp/protocol.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);

Admin message