There are two fixes with their tests:

- a subflow closed event can be visible multiple times, see issue #603

- the subflow closed event didn't contain the error as expected.

The 4 first patches are for -net, the rest are small fixes and
improvements for net-next. Some tests should be quicker now.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Changes in v2:
- Small updates on patches 1, 2, 3 and 5 (Geliang)
- Add Geliang RvB tags.
- Link to v1: https://patch.msgid.link/20251226-mptcp-issue-603-v1-0-bb30e331b839@kernel.org

---
Matthieu Baerts (NGI0) (11):
      mptcp: avoid dup SUB_CLOSED events after disconnect
      selftests: mptcp: check no dup close events after error
      mptcp: only reset subflow errors when propagated
      selftests: mptcp: check subflow errors in close events
      selftests: mptcp: join: wait for estab event instead of MPJ
      selftests: mptcp: join: fix wait_mpj helper
      selftests: mptcp: join: userspace: wait for new events
      selftests: mptcp: join chk_stale_nr: avoid dup stats
      selftests: mptcp: join: avoid declaring i if not used
      selftests: mptcp: connect: fix maybe-uninitialize warn
      selftests: mptcp: connect cleanup TFO setup

 net/mptcp/protocol.c                              |  13 +-
 tools/testing/selftests/net/mptcp/mptcp_connect.c |  19 ++-
 tools/testing/selftests/net/mptcp/mptcp_join.sh   | 149 +++++++++++++++-------
 3 files changed, 121 insertions(+), 60 deletions(-)
---
base-commit: b8bb952910af48167681524c5b217996c16382c1
change-id: 20251222-mptcp-issue-603-d85d967f7c0a

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

Hi Matthieu,

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): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Success! ✅
- 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/21371621189

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/69110da63c84
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1047262


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 Matt,

Thanks for this v2.

On Mon, 2026-01-26 at 20:18 +0100, Matthieu Baerts (NGI0) wrote:
> There are two fixes with their tests:
> 
> - a subflow closed event can be visible multiple times, see issue
> #603
> 
> - the subflow closed event didn't contain the error as expected.
> 
> The 4 first patches are for -net, the rest are small fixes and
> improvements for net-next. Some tests should be quicker now.
> 
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Looks good to me.

Reviewed-by: Geliang Tang <geliang@kernel.org>

-Geliang

> ---
> Changes in v2:
> - Small updates on patches 1, 2, 3 and 5 (Geliang)
> - Add Geliang RvB tags.
> - Link to v1:
> https://patch.msgid.link/20251226-mptcp-issue-603-v1-0-bb30e331b839@kernel.org
> 
> ---
> Matthieu Baerts (NGI0) (11):
>       mptcp: avoid dup SUB_CLOSED events after disconnect
>       selftests: mptcp: check no dup close events after error
>       mptcp: only reset subflow errors when propagated
>       selftests: mptcp: check subflow errors in close events
>       selftests: mptcp: join: wait for estab event instead of MPJ
>       selftests: mptcp: join: fix wait_mpj helper
>       selftests: mptcp: join: userspace: wait for new events
>       selftests: mptcp: join chk_stale_nr: avoid dup stats
>       selftests: mptcp: join: avoid declaring i if not used
>       selftests: mptcp: connect: fix maybe-uninitialize warn
>       selftests: mptcp: connect cleanup TFO setup
> 
>  net/mptcp/protocol.c                              |  13 +-
>  tools/testing/selftests/net/mptcp/mptcp_connect.c |  19 ++-
>  tools/testing/selftests/net/mptcp/mptcp_join.sh   | 149
> +++++++++++++++-------
>  3 files changed, 121 insertions(+), 60 deletions(-)
> ---
> base-commit: b8bb952910af48167681524c5b217996c16382c1
> change-id: 20251222-mptcp-issue-603-d85d967f7c0a
> 
> Best regards,

Hi Geliang,

On 27/01/2026 07:49, Geliang Tang wrote:
> Hi Matt,
> 
> Thanks for this v2.
> 
> On Mon, 2026-01-26 at 20:18 +0100, Matthieu Baerts (NGI0) wrote:
>> There are two fixes with their tests:
>>
>> - a subflow closed event can be visible multiple times, see issue
>> #603
>>
>> - the subflow closed event didn't contain the error as expected.
>>
>> The 4 first patches are for -net, the rest are small fixes and
>> improvements for net-next. Some tests should be quicker now.
>>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> Looks good to me.
> 
> Reviewed-by: Geliang Tang <geliang@kernel.org>

Thank you for the review!

Now in our tree:

New patches for t/upstream-net and t/upstream:
- e00c1cde2f33: mptcp: avoid dup SUB_CLOSED events after disconnect
- 2690dee1d1c2: selftests: mptcp: check no dup close events after error
- b00ab6a1c0a3: mptcp: only reset subflow errors when propagated
- 16cfe3e8f86d: selftests: mptcp: check subflow errors in close events
- Results: e2aed0b16078..b9ebb632c0c5 (export-net)
- Results: f35d5bacc3d9..3a7897f294e0 (export)

New patches for t/upstream:
- 3a865473b8fc: selftests: mptcp: join: wait for estab event instead of MPJ
- 0e605a03b612: selftests: mptcp: join: fix wait_mpj helper
- 7ba1f3ed5a69: selftests: mptcp: join: userspace: wait for new events
- 9c01b3c47ce3: selftests: mptcp: join chk_stale_nr: avoid dup stats
- 29d0083334ab: selftests: mptcp: join: avoid declaring i if not used
- e6a4afd1527a: selftests: mptcp: connect: fix maybe-uninitialize warn
- 983eaf267fa4: selftests: mptcp: connect cleanup TFO setup
- Results: 3a7897f294e0..7db9a30f8664 (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/f4278db6305ce32da9f5d541d3034ef2358f38e1/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/954a6c81672b5ff22af3066565cbbc8631fd70f6/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/8ad88e01fe8c2c5b0a6c897b0cf72bba60594b9a/checks

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