From: Geliang Tang <tanggeliang@kylinos.cn>

v4:
 - rollback to v2, just use icsk->icsk_rto.

Depends on:
 - mptcp: disable add_addr retrans, v2

Based-on: <cover.1754534416.git.tanggeliang@kylinos.cn>

v3:
 - a new patch, remove duplicate sk_reset_timer call
 - use __tcp_set_rto() * 2 instead of icsk->icsk_rto
 - update selftests.
 - https://patchwork.kernel.org/project/mptcp/cover/cover.1754449947.git.tanggeliang@kylinos.cn/

v2:
 - do not rename add_addr_timeout
 - use icsk->icsk_rto instead of tp->srtt_us
 - increase the time after each retransmission
 - https://patchwork.kernel.org/project/mptcp/patch/40706ad511220729207ccd7cf48e320e4d0d7dea.1754028199.git.tanggeliang@kylinos.cn/

v1:
 - https://patchwork.kernel.org/project/mptcp/cover/cover.1753777199.git.tanggeliang@kylinos.cn/

Geliang Tang (2):
  mptcp: make ADD_ADDR retransmission timeout adaptive
  selftests: mptcp: remove add_addr_timeout settings

 Documentation/networking/mptcp-sysctl.rst     |  4 +--
 net/mptcp/pm.c                                | 28 ++++++++++++++++---
 .../testing/selftests/net/mptcp/mptcp_join.sh |  3 --
 3 files changed, 26 insertions(+), 9 deletions(-)

-- 
2.48.1

Hi Geliang,

On 12/08/2025 10:39, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> v4:
>  - rollback to v2, just use icsk->icsk_rto.

Thank you for the v4. Thanks to the previous measurements you did, the
new version looks good to me:

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

I have one small comment in patch 1/2, but that's not blocking.

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

Hi Geliang,

On 15/08/2025 17:24, Matthieu Baerts wrote:
> Hi Geliang,
> 
> On 12/08/2025 10:39, Geliang Tang wrote:
>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>
>> v4:
>>  - rollback to v2, just use icsk->icsk_rto.
> 
> Thank you for the v4. Thanks to the previous measurements you did, the
> new version looks good to me:
> 
> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> I have one small comment in patch 1/2, but that's not blocking.

Now in our tree (with this suggestion ↑ -- feat. for -next):

New patches for t/upstream:
- 34c96ea5123b: mptcp: make ADD_ADDR retransmission timeout adaptive
- 5d56ac514943: selftests: mptcp: remove add_addr_timeout settings
- Results: d89b1338067d..de0b36f41cae (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/b44eb4c28d8623dfa68674caab04d9f7f07846ef/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: Unstable: 1 failed test(s): packetdrill_add_addr 🔴
- 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/16904044239

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


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)