From: Mat Martineau <mathew.j.martineau at linux.intel.com> To: mptcp at lists.01.org Subject: [MPTCP] [PATCH net-next 09/12] mptcp: Only use subflow EOF signaling on fallback connections Date: Tue, 28 Jul 2020 15:12:07 -0700 [thread overview] Message-ID: <20200728221210.92841-10-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: 20200728221210.92841-1-mathew.j.martineau@linux.intel.com [-- Attachment #1: Type: text/plain, Size: 886 bytes --] The MPTCP state machine handles disconnections on non-fallback connections, but the mptcp_sock still needs to get notified when fallback subflows disconnect. Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com> --- net/mptcp/subflow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 7ab2a52ad150..1c8482bc2ce5 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1159,7 +1159,8 @@ static void subflow_state_change(struct sock *sk) if (mptcp_subflow_data_available(sk)) mptcp_data_ready(parent, sk); - if (!(parent->sk_shutdown & RCV_SHUTDOWN) && + if (__mptcp_check_fallback(mptcp_sk(parent)) && + !(parent->sk_shutdown & RCV_SHUTDOWN) && !subflow->rx_eof && subflow_is_done(sk)) { subflow->rx_eof = 1; mptcp_subflow_eof(parent); -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Mat Martineau <mathew.j.martineau@linux.intel.com> To: netdev@vger.kernel.org Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>, mptcp@lists.01.org, matthieu.baerts@tessares.net, pabeni@redhat.com Subject: [PATCH net-next 09/12] mptcp: Only use subflow EOF signaling on fallback connections Date: Tue, 28 Jul 2020 15:12:07 -0700 [thread overview] Message-ID: <20200728221210.92841-10-mathew.j.martineau@linux.intel.com> (raw) In-Reply-To: <20200728221210.92841-1-mathew.j.martineau@linux.intel.com> The MPTCP state machine handles disconnections on non-fallback connections, but the mptcp_sock still needs to get notified when fallback subflows disconnect. Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> --- net/mptcp/subflow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 7ab2a52ad150..1c8482bc2ce5 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1159,7 +1159,8 @@ static void subflow_state_change(struct sock *sk) if (mptcp_subflow_data_available(sk)) mptcp_data_ready(parent, sk); - if (!(parent->sk_shutdown & RCV_SHUTDOWN) && + if (__mptcp_check_fallback(mptcp_sk(parent)) && + !(parent->sk_shutdown & RCV_SHUTDOWN) && !subflow->rx_eof && subflow_is_done(sk)) { subflow->rx_eof = 1; mptcp_subflow_eof(parent); -- 2.28.0
next reply other threads:[~2020-07-28 22:12 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-28 22:12 Mat Martineau [this message] 2020-07-28 22:12 ` [PATCH net-next 09/12] mptcp: Only use subflow EOF signaling on fallback connections Mat Martineau -- strict thread matches above, loose matches on Subject: below -- 2020-07-29 0:02 [MPTCP] Re: [PATCH net-next 00/12] Exchange MPTCP DATA_FIN/DATA_ACK before TCP FIN David Miller 2020-07-29 0:02 ` David Miller 2020-07-28 22:12 [MPTCP] [PATCH net-next 12/12] mptcp: Safely store sequence number when sending data Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 11/12] mptcp: Safely read sequence number when lock isn't held Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 10/12] mptcp: Skip unnecessary skb extension allocation for bare acks Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 08/12] mptcp: Use full MPTCP-level disconnect state machine Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 07/12] mptcp: Add helper to process acks of DATA_FIN Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 06/12] mptcp: Add mptcp_close_state() helper Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 05/12] mptcp: Track received DATA_FIN sequence number and add related helpers Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 04/12] mptcp: Use MPTCP-level flag for sending DATA_FIN Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 03/12] mptcp: Remove outdated and incorrect comment Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:12 [MPTCP] [PATCH net-next 02/12] mptcp: Return EPIPE if sending is shut down during a sendmsg Mat Martineau 2020-07-28 22:12 ` Mat Martineau 2020-07-28 22:11 [MPTCP] [PATCH net-next 01/12] mptcp: Allow DATA_FIN in headers without TCP FIN Mat Martineau 2020-07-28 22:11 ` Mat Martineau 2020-07-28 22:11 [MPTCP] [PATCH net-next 00/12] Exchange MPTCP DATA_FIN/DATA_ACK before " Mat Martineau 2020-07-28 22:11 ` Mat Martineau
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=20200728221210.92841-10-mathew.j.martineau@linux.intel.com \ --to=unknown@example.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.