From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: Mat Martineau <mathew.j.martineau@linux.intel.com>,
mptcp@lists.linux.dev
Cc: Paolo Abeni <pabeni@redhat.com>
Subject: Re: [PATCH mptcp-net] mptcp: Do not return EINPROGRESS when subflow creation succeeds
Date: Tue, 26 Jul 2022 12:20:31 +0200 [thread overview]
Message-ID: <d3bbbfcd-4b06-b7a9-eaea-38306e997beb@tessares.net> (raw)
In-Reply-To: <fd3161fb-c693-48ba-3972-f0fdfe9ef3@linux.intel.com>
Hi Mat,
On 25/07/2022 22:52, Mat Martineau wrote:
> On Fri, 15 Jul 2022, Mat Martineau wrote:
>
>> New subflows are created within the kernel using O_NONBLOCK, so
>> EINPROGRESS is the expected return value from kernel_connect().
>> __mptcp_subflow_connect() has the correct logic to consider EINPROGRESS
>> to be a successful case, but it has also used that error code as its
>> return value.
>>
>> Before v5.19 this was benign: all the callers ignored the return
>> value. Starting in v5.19 there is a MPTCP_PM_CMD_SUBFLOW_CREATE generic
>> netlink command that does use the return value, so the EINPROGRESS gets
>> propagated to userspace.
>>
>> Make __mptcp_subflow_connect() always return 0 on success instead.
>>
>> Fixes: ec3edaa7ca6c ("mptcp: Add handling of outgoing MP_JOIN requests")
>> Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow
>> establishment")
>> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>
> Noting here for the lore.kernel.org records: Paolo acked this patch
> today on IRC (#mptcp / irc.libera.chat).
>
> Given that ack, the simplicity of the change, and the timeline for this
> week's -net pull request, I'm sending this patch to netdev today.
Thank you for the patch and sorry for the delay.
I also applied this patch in our tree:
New patches for t/upstream-net:
- 75b93cbf0a74: mptcp: Do not return EINPROGRESS when subflow creation
succeeds
- Results: 78784c054bf1..76dabdd1e02b (export-net)
New patches for t/upstream:
- 75b93cbf0a74: mptcp: Do not return EINPROGRESS when subflow creation
succeeds
- Results: 7d1efaa490cf..f6822255c960 (export)
Tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20220726T082127
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220726T082127
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
prev parent reply other threads:[~2022-07-26 10:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-15 18:12 [PATCH mptcp-net] mptcp: Do not return EINPROGRESS when subflow creation succeeds Mat Martineau
2022-07-15 19:58 ` mptcp: Do not return EINPROGRESS when subflow creation succeeds: Tests Results MPTCP CI
2022-07-20 23:35 ` [PATCH mptcp-net] mptcp: Do not return EINPROGRESS when subflow creation succeeds Mat Martineau
2022-07-25 20:52 ` Mat Martineau
2022-07-26 10:20 ` Matthieu Baerts [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=d3bbbfcd-4b06-b7a9-eaea-38306e997beb@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.linux.dev \
--cc=pabeni@redhat.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: 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