tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
'time' is the local variable of run_test() function, while 'max_time' is
the local variable of do_transfer() function. So in do_transfer(),
$max_time should be used, not $time.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index ffa13a957a36..af70c14e0bf9 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -173,7 +173,7 @@ do_transfer()
timeout ${timeout_test} \
ip netns exec ${ns3} \
- ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $time \
+ ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \
0.0.0.0 < "$sin" > "$sout" &
local spid=$!
@@ -181,7 +181,7 @@ do_transfer()
timeout ${timeout_test} \
ip netns exec ${ns1} \
- ./mptcp_connect -jt ${timeout_poll} -p $port -T $time \
+ ./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \
10.0.3.3 < "$cin" > "$cout" &
local cpid=$!
--
2.35.3Hi Geliang, Mat, On 22/10/2022 15:35, Geliang Tang wrote: > 'time' is the local variable of run_test() function, while 'max_time' is > the local variable of do_transfer() function. So in do_transfer(), > $max_time should be used, not $time. Thank you for the patch and the review. As discussed at the last meeting, this is a clean-up, not link to issue #310 on GitHub. I just applied this patch in our tree (feat. for net-next) with Mat's RvB tag and a small note to mention the behaviour is not changed (so no Fixes tag). New patches for t/upstream: - ee199def31da: selftests: mptcp: use max_time instead of time - Results: d841341ecc36..c40114c3c367 (export) Tests are now in progress: https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20221103T171406 Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Hi Geliang, On 22/10/2022 15:35, Geliang Tang wrote: > 'time' is the local variable of run_test() function, while 'max_time' is > the local variable of do_transfer() function. So in do_transfer(), > $max_time should be used, not $time. Out of curiosity, did you create this patch because you were looking at issue #310 on GitHub? https://github.com/multipath-tcp/mptcp_net-next/issues/310 Would it help fixing the issues reported by the different CIs? Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Success! ✅:
- Task: https://cirrus-ci.com/task/6536517840535552
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6536517840535552/summary/summary.txt
- {"code":404,"message":
- "Can't find artifacts containing file conclusion.txt"}:
- Task: https://cirrus-ci.com/task/6259775448023040
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6259775448023040/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/4f37eaa09fcb
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-debug
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 (Tessares)
On Sat, 22 Oct 2022, Geliang Tang wrote:
> 'time' is the local variable of run_test() function, while 'max_time' is
> the local variable of do_transfer() function. So in do_transfer(),
> $max_time should be used, not $time.
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Looks good to me, thanks Geliang:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> ---
> tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
> index ffa13a957a36..af70c14e0bf9 100755
> --- a/tools/testing/selftests/net/mptcp/simult_flows.sh
> +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
> @@ -173,7 +173,7 @@ do_transfer()
>
> timeout ${timeout_test} \
> ip netns exec ${ns3} \
> - ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $time \
> + ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \
> 0.0.0.0 < "$sin" > "$sout" &
> local spid=$!
>
> @@ -181,7 +181,7 @@ do_transfer()
>
> timeout ${timeout_test} \
> ip netns exec ${ns1} \
> - ./mptcp_connect -jt ${timeout_poll} -p $port -T $time \
> + ./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \
> 10.0.3.3 < "$cin" > "$cout" &
> local cpid=$!
>
> --
> 2.35.3
>
>
>
--
Mat Martineau
Intel
Hi Geliang, Mat,
On 25/10/2022 02:15, Mat Martineau wrote:
> On Sat, 22 Oct 2022, Geliang Tang wrote:
>
>> 'time' is the local variable of run_test() function, while 'max_time' is
>> the local variable of do_transfer() function. So in do_transfer(),
>> $max_time should be used, not $time.
>>
>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>
> Looks good to me, thanks Geliang:
>
> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Should this go to -net with a 'Fixes' tag?
Fixes: b6ab64b074f2 ("selftests: mptcp: more stable simult_flows tests")
If yes, I can add do the modifications when applying the patch, no need
to send a v2.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
On Mon, 31 Oct 2022, Matthieu Baerts wrote:
> Hi Geliang, Mat,
>
> On 25/10/2022 02:15, Mat Martineau wrote:
>> On Sat, 22 Oct 2022, Geliang Tang wrote:
>>
>>> 'time' is the local variable of run_test() function, while 'max_time' is
>>> the local variable of do_transfer() function. So in do_transfer(),
>>> $max_time should be used, not $time.
>>>
>>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>>
>> Looks good to me, thanks Geliang:
>>
>> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>
> Should this go to -net with a 'Fixes' tag?
>
> Fixes: b6ab64b074f2 ("selftests: mptcp: more stable simult_flows tests")
>
> If yes, I can add do the modifications when applying the patch, no need
> to send a v2.
>
Since the old code works, I think it's ok to just apply for mptcp-next.
--
Mat Martineau
Intel
Hi Mat,
On 02/11/2022 01:11, Mat Martineau wrote:
> On Mon, 31 Oct 2022, Matthieu Baerts wrote:
>
>> Hi Geliang, Mat,
>>
>> On 25/10/2022 02:15, Mat Martineau wrote:
>>> On Sat, 22 Oct 2022, Geliang Tang wrote:
>>>
>>>> 'time' is the local variable of run_test() function, while
>>>> 'max_time' is
>>>> the local variable of do_transfer() function. So in do_transfer(),
>>>> $max_time should be used, not $time.
>>>>
>>>> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
>>>
>>> Looks good to me, thanks Geliang:
>>>
>>> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
>>
>> Should this go to -net with a 'Fixes' tag?
>>
>> Fixes: b6ab64b074f2 ("selftests: mptcp: more stable simult_flows tests")
>>
>> If yes, I can add do the modifications when applying the patch, no need
>> to send a v2.
>>
>
> Since the old code works, I think it's ok to just apply for mptcp-next.
If this patch helps reducing issues like this one:
https://github.com/multipath-tcp/mptcp_net-next/issues/310
Best to do it in -net I think, no? But I don't know if it helps reducing
such issues.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
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 🔴:
- Task: https://cirrus-ci.com/task/5890198042050560
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5890198042050560/summary/summary.txt
- {"code":404,"message":
- "Can't find artifacts containing file conclusion.txt"}:
- Task: https://cirrus-ci.com/task/5327248088629248
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5327248088629248/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/93625b5e6a48
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-debug
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 (Tessares)
© 2016 - 2023 Red Hat, Inc.