提交 813e0a68 编写于 作者: P Paolo Abeni 提交者: Jakub Kicinski

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: NPaolo Abeni <pabeni@redhat.com>
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
上级 d9ca1de8
...@@ -725,6 +725,7 @@ void mptcp_data_acked(struct sock *sk) ...@@ -725,6 +725,7 @@ void mptcp_data_acked(struct sock *sk)
mptcp_reset_timer(sk); mptcp_reset_timer(sk);
if ((!test_bit(MPTCP_SEND_SPACE, &mptcp_sk(sk)->flags) || if ((!test_bit(MPTCP_SEND_SPACE, &mptcp_sk(sk)->flags) ||
mptcp_send_head(sk) ||
(inet_sk_state_load(sk) != TCP_ESTABLISHED))) (inet_sk_state_load(sk) != TCP_ESTABLISHED)))
mptcp_schedule_work(sk); mptcp_schedule_work(sk);
} }
...@@ -1840,6 +1841,8 @@ static void mptcp_worker(struct work_struct *work) ...@@ -1840,6 +1841,8 @@ static void mptcp_worker(struct work_struct *work)
__mptcp_close_subflow(msk); __mptcp_close_subflow(msk);
__mptcp_move_skbs(msk); __mptcp_move_skbs(msk);
if (mptcp_send_head(sk))
mptcp_push_pending(sk, 0);
if (msk->pm.status) if (msk->pm.status)
pm_work(msk); pm_work(msk);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册