The actual fix is in patch 2/2, while patch 1/2 is there just to make
the change tidy/more easily reviewable.
---
v1 -> v2:
  - drop FASTCLOSE flag entirely

Paolo Abeni (2):
  mptcp: decouple mptcp fastclose from tcp close
  mptcp: fix duplicate reset on fastclose

 net/mptcp/protocol.c | 50 ++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

-- 
2.51.0

Hi Paolo, Geliang,

(I just noticed this email was unsent, the patches have been applied a
few hours ago)

On 07/11/2025 08:23, Paolo Abeni wrote:
> The actual fix is in patch 2/2, while patch 1/2 is there just to make
> the change tidy/more easily reviewable.

Thank you for the patches and the reviews! I had a few conflicts, but I
think I got it right.

Now in our tree (fixes for -net):

New patches for t/upstream-net and t/upstream:
- 408b267c6bd8: Revert "selftests: mptcp: join: fastclose: drop plain RST"
- 0ef8d2d40280: mptcp: decouple mptcp fastclose from tcp close (with
conflicts)
- 5413ee2c5a4b: mptcp: fix duplicate reset on fastclose (with conflicts)
- a5fd6152dbe2: conflict in t/mptcp-make-mptcp_destroy_common-static
- 69ec39f082d0: conflict in
t/mptcp-handle-first-subflow-closing-consistently
- 8a23d7a4757f: conflict in t/mptcp-introduce-mptcp-level-backlog
- e54a7311c74b: selftests: mptcp: join: fastclose: remove flaky marks
- Results: 0a46d88dd962..751a2432b7d8 (export-net)
- Results: 3ba6375d918e..247540d77d20 (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/7b747795627aab975ffff54ee796ccd77f593292/checks
- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/3f20649f33461a575a29a4da06d29ec9c50058cb/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/cf56fe8fbd0dde4dcb53f37ba20d59ac543bbf74/checks

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

Hi Paolo,

On Fri, 2025-11-07 at 08:23 +0100, Paolo Abeni wrote:
> The actual fix is in patch 2/2, while patch 1/2 is there just to make
> the change tidy/more easily reviewable.
> ---
> v1 -> v2:
>   - drop FASTCLOSE flag entirely

Apart from a nit in patch 2, this set looks good to me.

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

Note: As discussed in v1, with this set, "selftests: mptcp: join:
fastclose: drop plain RST" should be reverted.

Thanks,
-Geliang

> 
> Paolo Abeni (2):
>   mptcp: decouple mptcp fastclose from tcp close
>   mptcp: fix duplicate reset on fastclose
> 
>  net/mptcp/protocol.c | 50 ++++++++++++++++++++++++++++--------------
> --
>  1 file changed, 32 insertions(+), 18 deletions(-)
> 

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_mp_capable 🔴
- 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/19161574021

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


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)