[PATCH mptcp-next] selftests: mptcp: validate userspace PM tests by default

[PATCH mptcp-next] selftests: mptcp: validate userspace PM tests by default

[Matthieu Baerts]

The new script was not listed in the programs to test.

By concequence, some CIs running MPTCP selftests were not validating
these new tests. Note that MPTCP CI was validating it as it executes all
.sh scripts from 'tools/testing/selftests/net/mptcp' directory.

Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace PM type")
Reported-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
 tools/testing/selftests/net/mptcp/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index f905d5358e68..48a99e1453e1 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -6,7 +6,7 @@ KSFT_KHDR_INSTALL := 1
 CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
 
 TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
-	      simult_flows.sh mptcp_sockopt.sh
+	      simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
 
 TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
 
-- 
2.36.1

Re: selftests: mptcp: validate userspace PM tests by default: Tests Results

[MPTCP CI]

Hi Matthieu,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/5669279193366528
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5669279193366528/summary/summary.txt

- {"code":404,"message":
  - "Can't find artifacts containing file conclusion.txt"}:
  - Task: https://cirrus-ci.com/task/6597218206482432
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6597218206482432/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/795982e1ec62


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)

Re: selftests: mptcp: validate userspace PM tests by default: Tests Results

[MPTCP CI]

Hi Matthieu,

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/6585815751983104
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6585815751983104/summary/summary.txt

- KVM Validation: debug:
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5796690794905600
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5796690794905600/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/795982e1ec62


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)

Re: [PATCH mptcp-next] selftests: mptcp: validate userspace PM tests by default

[Mat Martineau]

On Wed, 6 Jul 2022, Matthieu Baerts wrote:

> The new script was not listed in the programs to test.
>
> By concequence, some CIs running MPTCP selftests were not validating
> these new tests. Note that MPTCP CI was validating it as it executes all
> .sh scripts from 'tools/testing/selftests/net/mptcp' directory.
>
> Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace PM type")
> Reported-by: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> ---
> tools/testing/selftests/net/mptcp/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
> index f905d5358e68..48a99e1453e1 100644
> --- a/tools/testing/selftests/net/mptcp/Makefile
> +++ b/tools/testing/selftests/net/mptcp/Makefile
> @@ -6,7 +6,7 @@ KSFT_KHDR_INSTALL := 1
> CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include $(KHDR_INCLUDES)
>
> TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
> -	      simult_flows.sh mptcp_sockopt.sh
> +	      simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
>
> TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
>
> -- 
> 2.36.1

Thanks for quickly acting on Jakub's note. Might end up sending this for 
-net too. I don't think it should conflict so where you put it in the 
export branch probably doesn't matter too much.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

--
Mat Martineau
Intel

Re: [PATCH mptcp-next] selftests: mptcp: validate userspace PM tests by default

[Matthieu Baerts]

Hi Mat,

On 06/07/2022 19:18, Mat Martineau wrote:
> On Wed, 6 Jul 2022, Matthieu Baerts wrote:
> 
>> The new script was not listed in the programs to test.
>>
>> By concequence, some CIs running MPTCP selftests were not validating
>> these new tests. Note that MPTCP CI was validating it as it executes all
>> .sh scripts from 'tools/testing/selftests/net/mptcp' directory.
>>
>> Fixes: 259a834fadda ("selftests: mptcp: functional tests for the
>> userspace PM type")
>> Reported-by: Jakub Kicinski <kuba@kernel.org>
>> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
>> ---
>> tools/testing/selftests/net/mptcp/Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/net/mptcp/Makefile
>> b/tools/testing/selftests/net/mptcp/Makefile
>> index f905d5358e68..48a99e1453e1 100644
>> --- a/tools/testing/selftests/net/mptcp/Makefile
>> +++ b/tools/testing/selftests/net/mptcp/Makefile
>> @@ -6,7 +6,7 @@ KSFT_KHDR_INSTALL := 1
>> CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)/usr/include
>> $(KHDR_INCLUDES)
>>
>> TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
>> -          simult_flows.sh mptcp_sockopt.sh
>> +          simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
>>
>> TEST_GEN_FILES = mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
>>
>> -- 
>> 2.36.1
> 
> Thanks for quickly acting on Jakub's note. Might end up sending this for
> -net too. I don't think it should conflict so where you put it in the
> export branch probably doesn't matter too much.

Good catch, sorry I forgot to change the tag to mptcp-net. This is
indeed for the -net branch.

> Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

Thank you for the review!

Now in our tree (fix for -net) with Mat's RvB tag:

New patches for t/upstream-net:
- 31cbb91049dd: selftests: mptcp: validate userspace PM tests by default
- Results: 521c161b5a7b..13cf255865b4 (export-net)

New patches for t/upstream:
- 31cbb91049dd: selftests: mptcp: validate userspace PM tests by default
- Results: 16136c6f92f3..6f160bf9e599 (export)


Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20220706T172635
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220706T172635

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net