From: Paolo Abeni <pabeni@redhat.com>
To: netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>,
mptcp@lists.01.org, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v2 10/13] mptcp: try to push pending data on snd una updates
Date: Thu, 12 Nov 2020 18:45:30 +0100 [thread overview]
Message-ID: <fddd06ca7375d53a9294efa195856a2439fb106c.1605199807.git.pabeni@redhat.com> (raw)
In-Reply-To: <cover.1605199807.git.pabeni@redhat.com>
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>
---
net/mptcp/protocol.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index eae457dc7061..86b4b6e2afbc 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -731,6 +731,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);
}
@@ -1835,6 +1836,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);
--
2.26.2
next prev parent reply other threads:[~2020-11-12 17:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 17:45 [PATCH net-next v2 00/13] mptcp: improve multiple xmit streams support Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 01/13] tcp: factor out tcp_build_frag() Paolo Abeni
2020-11-12 23:08 ` Jakub Kicinski
2020-11-12 23:12 ` Jakub Kicinski
2020-11-13 10:38 ` Paolo Abeni
2020-11-14 21:02 ` Jakub Kicinski
2020-11-12 17:45 ` [PATCH net-next v2 02/13] mptcp: use tcp_build_frag() Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 03/13] tcp: factor out __tcp_close() helper Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 04/13] mptcp: introduce mptcp_schedule_work Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 05/13] mptcp: reduce the arguments of mptcp_sendmsg_frag Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 06/13] mptcp: add accounting for pending data Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 07/13] mptcp: introduce MPTCP snd_nxt Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 08/13] mptcp: refactor shutdown and close Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 09/13] mptcp: move page frag allocation in mptcp_sendmsg() Paolo Abeni
2020-11-12 17:45 ` Paolo Abeni [this message]
2020-11-12 17:45 ` [PATCH net-next v2 11/13] mptcp: rework poll+nospace handling Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 12/13] mptcp: keep track of advertised windows right edge Paolo Abeni
2020-11-12 17:45 ` [PATCH net-next v2 13/13] mptcp: send explicit ack on delayed ack_seq incr Paolo Abeni
2020-11-14 21:05 ` [PATCH net-next v2 00/13] mptcp: improve multiple xmit streams support Jakub Kicinski
2020-11-15 15:46 ` Paolo Abeni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fddd06ca7375d53a9294efa195856a2439fb106c.1605199807.git.pabeni@redhat.com \
--to=pabeni@redhat.com \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).