Documentation/networking/mptcp-sysctl.rst | 2 ++ net/mptcp/pm.c | 18 ++++++++++++------ .../testing/selftests/net/mptcp/mptcp_join.sh | 1 + 3 files changed, 15 insertions(+), 6 deletions(-)
From: Geliang Tang <tanggeliang@kylinos.cn> v2: - move "remove duplicate sk_reset_timer call" into this set. - check add_addr timeout value in mptcp_pm_alloc_anno_list() too. This series enhances MPTCP's ADD_ADDR retransmission mechanism by: 1. Adding support for disabling retransmissions when add_addr_timeout is set to 0 2. Modifying the self-tests to leverage this new capability The first patch implements the core functionality change in the MPTCP subsystem, while the second patch updates the selftests to use this feature for stabilizing a specific test case. These changes provide more control over ADD_ADDR behavior and improve test reliability by eliminating race conditions caused by unexpected retransmissions. Patch 1: Remove duplicate sk_reset_timer call Patch 2: When add_addr_timeout is 0, skip retransmission entirely Patch 3: Disable retransmissions in "delete re-add signal" test Geliang Tang (3): mptcp: remove duplicate sk_reset_timer call mptcp: disable add_addr retransmission when timeout is 0 selftests: mptcp: disable add_addr retrans in endpoint_tests Documentation/networking/mptcp-sysctl.rst | 2 ++ net/mptcp/pm.c | 18 ++++++++++++------ .../testing/selftests/net/mptcp/mptcp_join.sh | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) -- 2.48.1
Hi Geliang, On 07/08/2025 04:44, Geliang Tang wrote: > From: Geliang Tang <tanggeliang@kylinos.cn> > > v2: > - move "remove duplicate sk_reset_timer call" into this set. > - check add_addr timeout value in mptcp_pm_alloc_anno_list() too. > > This series enhances MPTCP's ADD_ADDR retransmission mechanism by: > > 1. Adding support for disabling retransmissions when add_addr_timeout > is set to 0 > 2. Modifying the self-tests to leverage this new capability > > The first patch implements the core functionality change in the MPTCP > subsystem, while the second patch updates the selftests to use this > feature for stabilizing a specific test case. > > These changes provide more control over ADD_ADDR behavior and improve > test reliability by eliminating race conditions caused by unexpected > retransmissions. > > Patch 1: Remove duplicate sk_reset_timer call > Patch 2: When add_addr_timeout is 0, skip retransmission entirely > Patch 3: Disable retransmissions in "delete re-add signal" test Thank you for the new version. It looks good to me: Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> I will just check with Mat if we consider this as a fix or not. I think it is, but the behaviour is slightly changed, even if it is to avoid a buggy one. I will then apply these patches after the next bi-weekly meeting. Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Geliang, On 13/08/2025 16:19, Matthieu Baerts wrote: > Hi Geliang, > > On 07/08/2025 04:44, Geliang Tang wrote: >> From: Geliang Tang <tanggeliang@kylinos.cn> >> >> v2: >> - move "remove duplicate sk_reset_timer call" into this set. >> - check add_addr timeout value in mptcp_pm_alloc_anno_list() too. >> >> This series enhances MPTCP's ADD_ADDR retransmission mechanism by: >> >> 1. Adding support for disabling retransmissions when add_addr_timeout >> is set to 0 >> 2. Modifying the self-tests to leverage this new capability >> >> The first patch implements the core functionality change in the MPTCP >> subsystem, while the second patch updates the selftests to use this >> feature for stabilizing a specific test case. >> >> These changes provide more control over ADD_ADDR behavior and improve >> test reliability by eliminating race conditions caused by unexpected >> retransmissions. >> >> Patch 1: Remove duplicate sk_reset_timer call >> Patch 2: When add_addr_timeout is 0, skip retransmission entirely >> Patch 3: Disable retransmissions in "delete re-add signal" test > > Thank you for the new version. It looks good to me: > > Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> > > I will just check with Mat if we consider this as a fix or not. I think > it is, but the behaviour is slightly changed, even if it is to avoid a > buggy one. I will then apply these patches after the next bi-weekly meeting. Applied to our tree (fixes for -net): New patches for t/upstream-net and t/upstream: - 144959b26e16: mptcp: remove duplicate sk_reset_timer call - 5ca4045882f9: mptcp: disable add_addr retransmission when timeout is 0 - 230c29e8aa90: selftests: mptcp: disable add_addr retrans in endpoint_tests - Results: 3f23a1fbaa6a..077ce244fe7b (export-net) - Results: 7c14230bb733..186cac2c4d81 (export) Tests are now in progress: - export-net: https://github.com/multipath-tcp/mptcp_net-next/commit/097661ebac60d8cf1b143a91f6f11c71ef9fc5f5/checks - export: https://github.com/multipath-tcp/mptcp_net-next/commit/576e85a3c313b3b1ea09f8369458e2c31784b99b/checks Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: 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/16794019654
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/399555cff786
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=988945
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)
© 2016 - 2025 Red Hat, Inc.