1. Patchew
  2. MPTCP
  3. View series

[PATCH mptcp-next] Squash to "selftests: mptcp: pm_nl_ctl: always look for errors"

Matthieu Baerts posted 1 patch 2 years, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20230728152845.1020528-1-matthieu.baerts@tessares.net
Maintainers: Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <martineau@kernel.org>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH mptcp-next] Squash to "selftests: mptcp: pm_nl_ctl: always look for errors"
Posted by Matthieu Baerts 2 years, 6 months ago 
mptcp_join.sh selftest tries to add a bad endpoint on purpose ("ID
change is prevented") so it is normal to see this error:

   114 implicit EP
         creation                            [ ok ]
         mptcp_info subflows=1:1             [ ok ]
         mptcp_info add_addr=1:1             [ ok ]
   netlink error -22 (Invalid argument)
   ./pm_nl_ctl: bailing out due to netlink error[s]
         ID change is prevented              [ ok ]
         modif is allowed                    [ ok ]

We can mute the output because we expect an error.

We also need to edit the commit message to mention mptcp_join.sh
selftest also need to be modified, not just pm_netlink.sh.

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---

Notes:
    to be squashed in "selftests: mptcp: pm_nl_ctl: always look for errors"

 tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d23004ddd0b5..ee1f89a872b3 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3454,7 +3454,7 @@ endpoint_tests()
 		chk_mptcp_info subflows 1 subflows 1
 		chk_mptcp_info add_addr_signal 1 add_addr_accepted 1
 
-		pm_nl_add_endpoint $ns2 10.0.2.2 id 33
+		pm_nl_add_endpoint $ns2 10.0.2.2 id 33 2>/dev/null
 		pm_nl_check_endpoint "ID change is prevented" \
 			$ns2 10.0.2.2 id 1 flags implicit
 

base-commit: 7ba82a61fdc510b19dde7a394d08cd214e5e280a
-- 
2.40.1
Re: [PATCH mptcp-next] Squash to "selftests: mptcp: pm_nl_ctl: always look for errors"
Posted by Mat Martineau 2 years, 6 months ago 
On Fri, 28 Jul 2023, Matthieu Baerts wrote:

> mptcp_join.sh selftest tries to add a bad endpoint on purpose ("ID
> change is prevented") so it is normal to see this error:
>
>   114 implicit EP
>         creation                            [ ok ]
>         mptcp_info subflows=1:1             [ ok ]
>         mptcp_info add_addr=1:1             [ ok ]
>   netlink error -22 (Invalid argument)
>   ./pm_nl_ctl: bailing out due to netlink error[s]
>         ID change is prevented              [ ok ]
>         modif is allowed                    [ ok ]
>
> We can mute the output because we expect an error.
>
> We also need to edit the commit message to mention mptcp_join.sh
> selftest also need to be modified, not just pm_netlink.sh.
>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> ---
>
> Notes:
>    to be squashed in "selftests: mptcp: pm_nl_ctl: always look for errors"
>

Also fine with me to squash this one, thanks for tidying up the confusing 
output.

- Mat

> tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index d23004ddd0b5..ee1f89a872b3 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -3454,7 +3454,7 @@ endpoint_tests()
> 		chk_mptcp_info subflows 1 subflows 1
> 		chk_mptcp_info add_addr_signal 1 add_addr_accepted 1
>
> -		pm_nl_add_endpoint $ns2 10.0.2.2 id 33
> +		pm_nl_add_endpoint $ns2 10.0.2.2 id 33 2>/dev/null
> 		pm_nl_check_endpoint "ID change is prevented" \
> 			$ns2 10.0.2.2 id 1 flags implicit
>
>
> base-commit: 7ba82a61fdc510b19dde7a394d08cd214e5e280a
> -- 
> 2.40.1
>
>
>
Re: [PATCH mptcp-next] Squash to "selftests: mptcp: pm_nl_ctl: always look for errors"
Posted by Matthieu Baerts 2 years, 6 months ago 
Hi Mat,

On 28/07/2023 20:24, Mat Martineau wrote:
> On Fri, 28 Jul 2023, Matthieu Baerts wrote:
> 
>> mptcp_join.sh selftest tries to add a bad endpoint on purpose ("ID
>> change is prevented") so it is normal to see this error:
>>
>>   114 implicit EP
>>         creation                            [ ok ]
>>         mptcp_info subflows=1:1             [ ok ]
>>         mptcp_info add_addr=1:1             [ ok ]
>>   netlink error -22 (Invalid argument)
>>   ./pm_nl_ctl: bailing out due to netlink error[s]
>>         ID change is prevented              [ ok ]
>>         modif is allowed                    [ ok ]
>>
>> We can mute the output because we expect an error.
>>
>> We also need to edit the commit message to mention mptcp_join.sh
>> selftest also need to be modified, not just pm_netlink.sh.
>>
>> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
>> ---
>>
>> Notes:
>>    to be squashed in "selftests: mptcp: pm_nl_ctl: always look for
>> errors"
>>
> 
> Also fine with me to squash this one, thanks for tidying up the
> confusing output.

Thank you for the quick reviews!

Now in our tree:

New patches for t/upstream:
- c59d81165162: "squashed" in "selftests: mptcp: join: colored results"
- 005f14102f2f: "squashed" in "selftests: mptcp: pm_nl_ctl: always look
for errors"
- Results: dac913f8eca8..ba5729b64e7a (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20230730T052252

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
Re: Squash to "selftests: mptcp: pm_nl_ctl: always look for errors": Tests Results
Posted by MPTCP CI 2 years, 6 months ago 
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! ✅:
  - Task: https://cirrus-ci.com/task/4850365917560832
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4850365917560832/summary/summary.txt

- KVM Validation: debug (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/6539215777824768
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6539215777824768/summary/summary.txt

- KVM Validation: normal (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5976265824403456
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5976265824403456/summary/summary.txt

- KVM Validation: debug (except selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5413315870982144
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5413315870982144/summary/summary.txt

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


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)

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.