mptcp: Do not return EINPROGRESS when subflow creation succeeds
Subsystems (3)
PATCH 1/1 mptcp: Do not return EINPROGRESS when subflow creation succeeds
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.
---
Note: The original author of ec3edaa7ca6c is no longer reachable at that email address.
--- net/mptcp/subflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/subflow.c +1 -1
@@ -1533,7 +1533,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,mptcp_sock_graft (ssk, sk->sk_socket);iput (SOCK_INODE (sf));WRITE_ONCE (msk->allow_infinite_fallback, false); -return err; +return 0 ; failed_unlink:list_del (&subflow->node);
base-commit: 9af0620de1e118666881376f6497d1785758b04c
Signature · 1 line
2.37.1
Re: mptcp: Do not return EINPROGRESS when subflow creation succeeds: Tests Results
Hi Mat,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
- Task: https://cirrus-ci.com/task/5587014698401792
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5587014698401792/summary/summary.txt
- KVM Validation: debug:
- Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
- Task: https://cirrus-ci.com/task/5503009298841600
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5503009298841600/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/22f5cd0965a5
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debugFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Mon, 25 Jul 2022 13:52:31 -0700 you wrote:
New subflows are created within the kernel using
O_NONBLOCK, so EINPROGRESS is the expected return value fromkernel_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.
Quoted 6 lines
Before v5.19 this was benign: all the callers ignored the return value. Starting in v5.19 there is a
MPTCP_PM_CMD_SUBFLOW_CREATEgeneric netlink command that does use the return value, so the EINPROGRESS gets propagated to userspace.[...]
Here is the summary with links:
- [net] mptcp: Do not return EINPROGRESS when subflow creation succeeds
https://git.kernel.org/netdev/net/c/b5177ed92bf6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html