[PATCH mptcp-next] Squash to "selftests: mptcp: update userspace pm test helpers"

[PATCH mptcp-next] Squash to "selftests: mptcp: update userspace pm test helpers"

[Geliang Tang]

Put MPTCP event macros together.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index fefdb1a4c465..ae38b428e42e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -51,8 +51,6 @@ TEST_COUNT=0
 TEST_NAME=""
 nr_blank=6
 
-SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
-
 # These var are used only in some tests, make sure they are not already set
 unset FAILING_LINKS
 unset test_linkfail
@@ -2830,6 +2828,7 @@ backup_tests()
 	fi
 }
 
+SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
 LISTENER_CREATED=15 #MPTCP_EVENT_LISTENER_CREATED
 LISTENER_CLOSED=16  #MPTCP_EVENT_LISTENER_CLOSED
 
-- 
2.35.3

Re: Squash to "selftests: mptcp: update userspace pm test helpers": Tests Results

[MPTCP CI]

Hi Geliang,

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

- KVM Validation: debug (only selftest_mptcp_join):
  - Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
  - Task: https://cirrus-ci.com/task/4954543738322944
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4954543738322944/summary/summary.txt

- KVM Validation: debug (except selftest_mptcp_join):
  - Unstable: 1 failed test(s): packetdrill_regressions 🔴:
  - Task: https://cirrus-ci.com/task/6361918621876224
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6361918621876224/summary/summary.txt

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

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


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] Squash to "selftests: mptcp: update userspace pm test helpers"

[Matthieu Baerts]

Hi Geliang,

On 30/09/2023 10:30, Geliang Tang wrote:
> Put MPTCP event macros together.

Thank you for the follow-up patch, good idea, I missed that!

New patches for t/upstream:
- 114421ed8ba7: Squash to "selftests: mptcp: update userspace pm test
helpers"
- Results: 9de414b56675..3cbb19268039 (export)

Cheers,
Matt

[PATCH mptcp-next] Squash to "selftests: mptcp: update userspace pm test helpers"

[Geliang Tang]

Fix userspace pm errors reported by CI:

[11:10:11.889] # 112 userspace pm add & remove address
[11:10:29.692] #       syn                                 [ ok ]
[11:10:30.294] #       synack                              [ ok ]
[11:10:30.686] #       ack                                 [ ok ]
[11:10:31.263] #       add                                 [ ok ]
[11:10:31.653] #       echo                                [ ok ]
[11:10:33.644] #       mptcp_info subflows=1:1             [ ok ]
[11:10:35.761] #       subflows_total 2:2                  [ ok ]
[11:10:36.762] #       mptcp_info add_addr_signal=1:1      [ ok ]
[11:10:44.932] #       rm                                  [ ok ]
[11:10:45.321] #       rmsf                                [ ok ]
[11:10:45.325] #       Info: invert
[11:10:46.405] #       mptcp_info subflows=0:0             [ ok ]
[11:10:48.048] #       subflows_total 1:1                  [fail] got subflows 0:0 expected 1:1
[11:10:48.052] # Server ns stats
[11:10:48.310] # TcpPassiveOpens                 2                  0.0
[11:10:48.315] # TcpInSegs                       118                0.0

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 01480663c102..4803ba1ab42d 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3316,7 +3316,7 @@ userspace_pm_rm_addr()
 	tk=$(mptcp_lib_evts_get_info token "$evts")
 
 	ip netns exec $1 ./pm_nl_ctl rem token $tk id $2
-	wait_rm_addr $1 1
+	wait_rm_addr $1
 }
 
 # $1: ns ; $2: addr ; $3: id
@@ -3352,7 +3352,7 @@ userspace_pm_rm_sf()
 
 	ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \
 				rip $da rport $dp token $tk
-	wait_rm_sf $1 1
+	wait_rm_sf $1
 }
 
 userspace_tests()
-- 
2.35.3

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: update userspace pm test helpers"

[Matthieu Baerts]

Hi Geliang,

14 Oct 2023 18:42:28 Geliang Tang <geliang.tang@suse.com>:

> Fix userspace pm errors reported by CI:
>
> [11:10:11.889] # 112 userspace pm add & remove address
> [11:10:29.692] #       syn                                 [ ok ]
> [11:10:30.294] #       synack                              [ ok ]
> [11:10:30.686] #       ack                                 [ ok ]
> [11:10:31.263] #       add                                 [ ok ]
> [11:10:31.653] #       echo                                [ ok ]
> [11:10:33.644] #       mptcp_info subflows=1:1             [ ok ]
> [11:10:35.761] #       subflows_total 2:2                  [ ok ]
> [11:10:36.762] #       mptcp_info add_addr_signal=1:1      [ ok ]
> [11:10:44.932] #       rm                                  [ ok ]
> [11:10:45.321] #       rmsf                                [ ok ]
> [11:10:45.325] #       Info: invert
> [11:10:46.405] #       mptcp_info subflows=0:0             [ ok ]
> [11:10:48.048] #       subflows_total 1:1                  [fail] got subflows 0:0 expected 1:1
> [11:10:48.052] # Server ns stats
> [11:10:48.310] # TcpPassiveOpens                 2                  0.0
> [11:10:48.315] # TcpInSegs                       118                0.0

Thank you for looking at that!

Do you mind explaining why it is fixing the issue and/or why it was not OK before please?

> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index 01480663c102..4803ba1ab42d 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -3316,7 +3316,7 @@ userspace_pm_rm_addr()
>     tk=$(mptcp_lib_evts_get_info token "$evts")
>
>     ip netns exec $1 ./pm_nl_ctl rem token $tk id $2
> -   wait_rm_addr $1 1
> +   wait_rm_addr $1

From what I understand, this will skip the wait: the number of RM_ADDR will always be different than an empty string.

The second argument represents the number of RM_ADDR before sending the command.

Should it not be 0 issue of 1?

Or better:

  local cnt

  (...)

  cnt=$(rm_addr_count ${1})
  ip netns exec $1 ./pm_nl_ctl rem token $tk id $2
  wait_rm_addr $1 "${cnt}"

No?

> }
>
> # $1: ns ; $2: addr ; $3: id
> @@ -3352,7 +3352,7 @@ userspace_pm_rm_sf()
>
>     ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \
>                 rip $da rport $dp token $tk
> -   wait_rm_sf $1 1
> +   wait_rm_sf $1

Same here, you need to pass a second argument to the function otherwise it does nothing. So same as suggested above but with "rm_sf_count" instead.

But I don't know if this will fix the issue.

Cheers,
Matt


> }
>
> userspace_tests()
> --
> 2.35.3

--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net