A previous attempt was helping, but not enough as the background
connections were still stopped after the timeout. That's what the MPTCP
CI recently reported with the "delete and re-add" subtest taking a bit
more than one minute in a debug environment.

To play it safe, and because increasing the timeout for the background
connections doesn't change anything to the end result (the transfer is
not checked in this case), all subtests with a background connection not
waiting for it to end now have a longer timeout.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (2):
      selftests: mptcp: join: endpoints: longer timeout
      selftests: mptcp: join: userspace: longer timeout

 tools/testing/selftests/net/mptcp/mptcp_join.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
---
base-commit: 83290f9ea1dc9994e0064956147443b2fc290dca
change-id: 20251112-slft-longer-timeout-5a48e854a933

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

Hello,

On 12/11/2025 10:45, Matthieu Baerts (NGI0) wrote:
> A previous attempt was helping, but not enough as the background
> connections were still stopped after the timeout. That's what the MPTCP
> CI recently reported with the "delete and re-add" subtest taking a bit
> more than one minute in a debug environment.
> 
> To play it safe, and because increasing the timeout for the background
> connections doesn't change anything to the end result (the transfer is
> not checked in this case), all subtests with a background connection not
> waiting for it to end now have a longer timeout.

I hope it is OK if I apply these patches now: they are simple, linked to
recent patches, and we still have quite a few patches in the queue.

I'm planning to send them with other patches we have in the queue for
net ideally today.

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

Hi Matt,

On Mon, 2025-11-17 at 12:08 +0100, Matthieu Baerts wrote:
> Hello,
> 
> On 12/11/2025 10:45, Matthieu Baerts (NGI0) wrote:
> > A previous attempt was helping, but not enough as the background
> > connections were still stopped after the timeout. That's what the
> > MPTCP
> > CI recently reported with the "delete and re-add" subtest taking a
> > bit
> > more than one minute in a debug environment.
> > 
> > To play it safe, and because increasing the timeout for the
> > background
> > connections doesn't change anything to the end result (the transfer
> > is
> > not checked in this case), all subtests with a background
> > connection not
> > waiting for it to end now have a longer timeout.
> 
> I hope it is OK if I apply these patches now: they are simple, linked
> to
> recent patches, and we still have quite a few patches in the queue.
> 
> I'm planning to send them with other patches we have in the queue for
> net ideally today.

Sorry for the delay. I just replied my RB tags to them for -net.

Thanks,
-Geliang

> 
> Cheers,
> Matt

Hi Geliang,

On 18/11/2025 09:43, Geliang Tang wrote:
> On Mon, 2025-11-17 at 12:08 +0100, Matthieu Baerts wrote:
>> On 12/11/2025 10:45, Matthieu Baerts (NGI0) wrote:
>>> A previous attempt was helping, but not enough as the background
>>> connections were still stopped after the timeout. That's what the
>>> MPTCP
>>> CI recently reported with the "delete and re-add" subtest taking a
>>> bit
>>> more than one minute in a debug environment.
>>>
>>> To play it safe, and because increasing the timeout for the
>>> background
>>> connections doesn't change anything to the end result (the transfer
>>> is
>>> not checked in this case), all subtests with a background
>>> connection not
>>> waiting for it to end now have a longer timeout.
>>
>> I hope it is OK if I apply these patches now: they are simple, linked
>> to
>> recent patches, and we still have quite a few patches in the queue.
>>
>> I'm planning to send them with other patches we have in the queue for
>> net ideally today.
> 
> Sorry for the delay. I just replied my RB tags to them for -net.

No problem, I'm sure that kind of simple patch in the selftests would
have been accepted without additional tags. Thank you for having sent them!

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

On 17/11/2025 12:08, Matthieu Baerts wrote:
> Hello,
> 
> On 12/11/2025 10:45, Matthieu Baerts (NGI0) wrote:
>> A previous attempt was helping, but not enough as the background
>> connections were still stopped after the timeout. That's what the MPTCP
>> CI recently reported with the "delete and re-add" subtest taking a bit
>> more than one minute in a debug environment.
>>
>> To play it safe, and because increasing the timeout for the background
>> connections doesn't change anything to the end result (the transfer is
>> not checked in this case), all subtests with a background connection not
>> waiting for it to end now have a longer timeout.
> 
> I hope it is OK if I apply these patches now: they are simple, linked to
> recent patches, and we still have quite a few patches in the queue.

Done:

New patches for t/upstream-net and t/upstream:
- 16a4ac47cd40: selftests: mptcp: join: endpoints: longer timeout
- 5dd3ee3a0e67: selftests: mptcp: join: userspace: longer timeout
- Results: b6737ab5301a..7cd73169934a (export-net)
- Results: 622c76f2be66..f642d28cfc23 (export)

Tests are now in progress:

- export-net:
https://github.com/multipath-tcp/mptcp_net-next/commit/660070b99dec84a338e2efd835be9a68f63316a1/checks
- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/89520dc46a1f4d65bffc7bac94b57b3ecf12cbe9/checks

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

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): Unstable: 1 failed test(s): selftest_diag 🔴
- 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/19293439106

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


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)