From: Greg KH <gregkh@linuxfoundation.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: stable@vger.kernel.org, MPTCP Upstream <mptcp@lists.linux.dev>,
Paolo Abeni <pabeni@redhat.com>,
Mat Martineau <martineau@kernel.org>,
Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCH 5.15.y] mptcp: consolidate fallback and non fallback state machine
Date: Wed, 28 Jun 2023 20:20:43 +0200 [thread overview]
Message-ID: <2023062828-affiliate-overlook-8535@gregkh> (raw)
In-Reply-To: <20230627132557.2266416-1-matthieu.baerts@tessares.net>
On Tue, Jun 27, 2023 at 03:25:57PM +0200, Matthieu Baerts wrote:
> From: Paolo Abeni <pabeni@redhat.com>
>
> commit 81c1d029016001f994ce1c46849c5e9900d8eab8 upstream.
>
> An orphaned msk releases the used resources via the worker,
> when the latter first see the msk in CLOSED status.
>
> If the msk status transitions to TCP_CLOSE in the release callback
> invoked by the worker's final release_sock(), such instance of the
> workqueue will not take any action.
>
> Additionally the MPTCP code prevents scheduling the worker once the
> socket reaches the CLOSE status: such msk resources will be leaked.
>
> The only code path that can trigger the above scenario is the
> __mptcp_check_send_data_fin() in fallback mode.
>
> Address the issue removing the special handling of fallback socket
> in __mptcp_check_send_data_fin(), consolidating the state machine
> for fallback and non fallback socket.
>
> Since non-fallback sockets do not send and do not receive data_fin,
> the mptcp code can update the msk internal status to match the next
> step in the SM every time data fin (ack) should be generated or
> received.
>
> As a consequence we can remove a bunch of checks for fallback from
> the fastpath.
>
> Fixes: 6e628cd3a8f7 ("mptcp: use mptcp release_cb for delayed tasks")
> Cc: stable@vger.kernel.org
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> Reviewed-by: Mat Martineau <martineau@kernel.org>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> ---
> Conflicting with:
> - 0522b424c4c2 ("mptcp: add do_check_data_fin to replace copied")
> - 3e5014909b56 ("mptcp: cleanup MPJ subflow list handling")
>
> I took the new modifications but leaving the old variable name for
> "copied" instead of "do_check_data_fin" and the calls to
> __mptcp_flush_join_list()
>
> Applied on top of d2efde0d1c2e ("Linux 5.15.119-rc1").
>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
All backports now queued up, thanks.
greg k-h
prev parent reply other threads:[~2023-06-28 18:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 9:31 FAILED: patch "[PATCH] mptcp: consolidate fallback and non fallback state machine" failed to apply to 5.15-stable tree gregkh
2023-06-27 13:25 ` [PATCH 5.15.y] mptcp: consolidate fallback and non fallback state machine Matthieu Baerts
2023-06-28 18:20 ` Greg KH [this message]
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=2023062828-affiliate-overlook-8535@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=martineau@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=stable@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