Two somewhat related fixes addressing different issues producing
exactly the same splat (issues/586).

Patch 2 now takes in account more edge cases.

Paolo Abeni (2):
  mptcp: fallback earlier on simult connection
  mptcp: ensure context reset on disconnect()

 net/mptcp/options.c  | 10 ++++++++++
 net/mptcp/protocol.c |  8 +++++---
 net/mptcp/protocol.h |  9 ++++-----
 net/mptcp/subflow.c  |  6 ------
 4 files changed, 19 insertions(+), 14 deletions(-)

-- 
2.52.0

Hi Paolo,

On 05/12/2025 10:58, Paolo Abeni wrote:
> Two somewhat related fixes addressing different issues producing
> exactly the same splat (issues/586).
> 
> Patch 2 now takes in account more edge cases.
> 
> Paolo Abeni (2):
>   mptcp: fallback earlier on simult connection
>   mptcp: ensure context reset on disconnect()

Thank you for these fixes!

Now in our tree:

New patches for t/upstream-net and t/upstream:
- 1440e0387c99: mptcp: fallback earlier on simult connection
- 44e82feac422: mptcp: ensure context reset on disconnect()
- Results: 747eaa6d8997..d36c213dc2b5 (export-net)
- 2419c9c4c208: conflict in t/mptcp-better-mptcp-level-RTT-estimator
- Results: a82b483f14fa..f2b1f9f41c2d (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/28af05d8581af0c8b8296330d48c67d62ff66efe/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/ea5f5e676cf524729a78070fa3f674f11cf09059/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Hi Paolo,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join): Unstable: 1 failed test(s): packetdrill_syscalls 🔴
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 2 failed test(s): packetdrill_dss packetdrill_syscalls 🔴
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/19965087423

Initiator: Matthieu Baerts (NGI0)
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/ed0dfd57a2bc
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1030787


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-normal

For 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 (NGI0 Core)

Hi Paolo,

On 05/12/2025 10:58, Paolo Abeni wrote:
> Two somewhat related fixes addressing different issues producing
> exactly the same splat (issues/586).
> 
> Patch 2 now takes in account more edge cases.

Thank you for the v3! I can no longer reproduce the syzkaller issue now!

The modifications look good to me:

Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

It looks like the series was not on top of the "export" branch: I fixed
the conflict and asked the CI to test it. I will apply these two patches
after that, just in case.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.