* [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh
@ 2023-12-05 7:00 Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers Geliang Tang
` (32 more replies)
0 siblings, 33 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
v5:
- rebased with "userspace pm enhancements" v13
This series includes three parts:
Part 1: add more helpers in mptcp_lib.sh (patches 1-11)
Part 2: print colored output and test counters (patches 12-24)
Part 3: add more vars in mptcp_lib.sh (patches 25-33)
v4:
- rebased with "userspace pm enhancements" v12
v3:
- merge squash-to patch for v2:
Squash to "selftests: mptcp: add mptcp_lib_ns_* helpers"
- add a new patch:
selftests: mptcp: simult flows: define missing vars
- update patches:
selftests: mptcp: export event macros in mptcp_lib
selftests: mptcp: export cin/cout/sin/sout vars
selftests: mptcp: netlink: fix positions of newline
- update some commit subjects and commit logs.
v2:
- add more patches.
Geliang Tang (33):
selftests: mptcp: add mptcp_lib_evts_* helpers
selftests: mptcp: userspace: capitalize test_name
selftests: mptcp: userspace: print colored output
selftests: mptcp: capitalize ok/fail/skip
selftests: mptcp: extract mptcp_lib_check_expected
selftests: mptcp: export event macros in mptcp_lib
selftests: mptcp: add mptcp_lib_verify_listener_events
selftests: mptcp: unify namespace names
selftests: mptcp: add mptcp_lib_ns_* helpers
selftests: mptcp: add ss mptcp support checks
selftests: mptcp: add mptcp_lib_check_tools helper
selftests: mptcp: diag: print colored output
selftests: mptcp: connect: print colored output
selftests: mptcp: sockopt: print every test result
selftests: mptcp: sockopt: print colored output
selftests: mptcp: simult flows: print colored output
selftests: mptcp: connect: add PORT instead of TEST_COUNT
selftests: mptcp: connect: print out test counter
selftests: mptcp: rename test_cnt to TEST_COUNT
selftests: mptcp: diag: print out test counter
selftests: mptcp: simult flows: print out test counter
selftests: mptcp: sockopt: print out test counter
selftests: mptcp: netlink: print out test counter
selftests: mptcp: userspace: print out test counter
selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib
selftests: mptcp: simult flows: define missing vars
selftests: mptcp: export cin/cout/sin/sout vars
selftests: mptcp: join: change capture/checksum as bool
selftests: mptcp: export capture/checksum vars
selftests: mptcp: diag: change timeout_poll to 30
selftests: mptcp: export timeout_test to mptcp_lib
selftests: mptcp: use KSFT_SKIP instead ksft_skip
selftests: mptcp: use KSFT_PASS and KSFT_FAIL
tools/testing/selftests/net/mptcp/diag.sh | 89 +++---
.../selftests/net/mptcp/mptcp_connect.sh | 115 +++-----
.../testing/selftests/net/mptcp/mptcp_join.sh | 202 ++++---------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 244 ++++++++++++++++
.../selftests/net/mptcp/mptcp_sockopt.sh | 98 +++----
.../testing/selftests/net/mptcp/pm_netlink.sh | 25 +-
.../selftests/net/mptcp/simult_flows.sh | 54 +---
.../selftests/net/mptcp/userspace_pm.sh | 272 ++++++------------
8 files changed, 529 insertions(+), 570 deletions(-)
--
2.35.3
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 02/33] selftests: mptcp: userspace: capitalize test_name Geliang Tang
` (31 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
To avoid duplicated code in different MPTCP selftests, we can add and
use helpers defined in mptcp_lib.sh.
This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh
and mptcp_join.sh into four helpers: mptcp_lib_evts_init(), _start(),
_kill() and _remove(). Define them in mptcp_lib.sh and use these new
helpers in both scripts.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 58 +++++++----------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 63 +++++++++++++++++++
.../selftests/net/mptcp/userspace_pm.sh | 31 ++-------
3 files changed, 90 insertions(+), 62 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 6d81e6e1de52..b586bc404668 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -34,10 +34,6 @@ ip_mptcp=0
check_invert=0
validate_checksum=0
init=0
-evts_ns1=""
-evts_ns2=""
-evts_ns1_pid=0
-evts_ns2_pid=0
last_test_failed=0
last_test_skipped=0
last_test_ignored=1
@@ -183,8 +179,7 @@ init() {
cin=$(mktemp)
cinsent=$(mktemp)
cout=$(mktemp)
- evts_ns1=$(mktemp)
- evts_ns2=$(mktemp)
+ mptcp_lib_evts_init
trap cleanup EXIT
@@ -197,7 +192,7 @@ cleanup()
rm -f "$cin" "$cout" "$sinfail"
rm -f "$sin" "$sout" "$cinsent" "$cinfail"
rm -f "$tmpfile"
- rm -rf $evts_ns1 $evts_ns2
+ mptcp_lib_evts_remove
cleanup_partial
mptcp_lib_cleanup
}
@@ -462,12 +457,7 @@ reset_with_events()
{
reset "${1}" || return 1
- :> "$evts_ns1"
- :> "$evts_ns2"
- ip netns exec $ns1 ./pm_nl_ctl events >> "$evts_ns1" 2>&1 &
- evts_ns1_pid=$!
- ip netns exec $ns2 ./pm_nl_ctl events >> "$evts_ns2" 2>&1 &
- evts_ns2_pid=$!
+ mptcp_lib_evts_start "${ns1}" "${ns2}"
}
reset_with_tcp_filter()
@@ -637,12 +627,6 @@ wait_mpj()
done
}
-kill_events_pids()
-{
- mptcp_lib_kill_wait $evts_ns1_pid
- mptcp_lib_kill_wait $evts_ns2_pid
-}
-
kill_tests_wait()
{
#shellcheck disable=SC2046
@@ -2918,9 +2902,9 @@ add_addr_ports_tests()
chk_add_nr 1 1 1
chk_rm_nr 1 1 invert
- verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 10100
- verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100
- kill_events_pids
+ verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 10100
+ verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 10100
+ mptcp_lib_evts_kill
fi
# subflow and signal with port, remove
@@ -3293,10 +3277,10 @@ fail_tests()
# $1: ns ; $2: addr ; $3: id
userspace_pm_add_addr()
{
- local evts=$evts_ns1
+ local evts=$server_evts
local tk
- [ "$1" == "$ns2" ] && evts=$evts_ns2
+ [ "$1" == "$ns2" ] && evts=$client_evts
tk=$(mptcp_lib_evts_get_info token "$evts")
ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3
@@ -3306,11 +3290,11 @@ userspace_pm_add_addr()
# $1: ns ; $2: id
userspace_pm_rm_addr()
{
- local evts=$evts_ns1
+ local evts=$server_evts
local tk
local cnt
- [ "$1" == "$ns2" ] && evts=$evts_ns2
+ [ "$1" == "$ns2" ] && evts=$client_evts
tk=$(mptcp_lib_evts_get_info token "$evts")
cnt=$(rm_addr_count ${1})
@@ -3321,10 +3305,10 @@ userspace_pm_rm_addr()
# $1: ns ; $2: addr ; $3: id
userspace_pm_add_sf()
{
- local evts=$evts_ns1
+ local evts=$server_evts
local tk da dp
- [ "$1" == "$ns2" ] && evts=$evts_ns2
+ [ "$1" == "$ns2" ] && evts=$client_evts
tk=$(mptcp_lib_evts_get_info token "$evts")
da=$(mptcp_lib_evts_get_info daddr4 "$evts")
dp=$(mptcp_lib_evts_get_info dport "$evts")
@@ -3337,13 +3321,13 @@ userspace_pm_add_sf()
# $1: ns ; $2: addr $3: event type
userspace_pm_rm_sf()
{
- local evts=$evts_ns1
+ local evts=$server_evts
local t=${3:-1}
local ip
local tk da dp sp
local cnt
- [ "$1" == "$ns2" ] && evts=$evts_ns2
+ [ "$1" == "$ns2" ] && evts=$client_evts
[ -n "$(mptcp_lib_evts_get_info "saddr4" "$evts" $t)" ] && ip=4
[ -n "$(mptcp_lib_evts_get_info "saddr6" "$evts" $t)" ] && ip=6
tk=$(mptcp_lib_evts_get_info token "$evts")
@@ -3457,7 +3441,7 @@ userspace_tests()
chk_rm_nr 1 1 invert
chk_mptcp_info subflows 0 subflows 0
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3479,7 +3463,7 @@ userspace_tests()
chk_rm_nr 1 1
chk_mptcp_info subflows 0 subflows 0
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3500,7 +3484,7 @@ userspace_tests()
chk_join_nr 1 1 1
chk_mptcp_info subflows 1 subflows 1
chk_subflows_total 2 2
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3524,7 +3508,7 @@ userspace_tests()
chk_rst_nr 0 0 invert
chk_mptcp_info subflows 1 subflows 1
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3550,7 +3534,7 @@ userspace_tests()
chk_rst_nr 0 0 invert
chk_mptcp_info subflows 1 subflows 1
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3579,7 +3563,7 @@ userspace_tests()
chk_rm_nr 1 1 invert
chk_mptcp_info subflows 0 subflows 0
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
@@ -3608,7 +3592,7 @@ userspace_tests()
chk_rm_nr 1 1
chk_mptcp_info subflows 0 subflows 0
chk_subflows_total 1 1
- kill_events_pids
+ mptcp_lib_evts_kill
wait $tests_pid
fi
}
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index a28b480e164b..a41da009962f 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -329,6 +329,69 @@ mptcp_lib_check_output() {
fi
}
+server_evts=""
+client_evts=""
+server_evts_pid=0
+client_evts_pid=0
+
+# server_evts(_pid) and client_evts(_pid) are needed
+# by mptcp_lib_evts_init, _start, _kill and _remove.
+mptcp_lib_evts_init() {
+ : "${server_evts?}"
+ : "${client_evts?}"
+
+ if [ -z "${server_evts}" ]; then
+ server_evts=$(mktemp)
+ fi
+ if [ -z "${client_evts}" ]; then
+ client_evts=$(mktemp)
+ fi
+}
+
+# $1 ns1, $2 ns2
+mptcp_lib_evts_start() {
+ : "${server_evts:?}"
+ : "${client_evts:?}"
+ : "${server_evts_pid:?}"
+ : "${client_evts_pid:?}"
+
+ local ns_1="${1}"
+ local ns_2="${2}"
+
+ :>"$server_evts"
+ :>"$client_evts"
+
+ if [ "${server_evts_pid}" -ne 0 ]; then
+ mptcp_lib_kill_wait "${server_evts_pid}"
+ fi
+ ip netns exec "${ns_1}" ./pm_nl_ctl events >> "${server_evts}" 2>&1 &
+ server_evts_pid=$!
+
+ if [ "${client_evts_pid}" -ne 0 ]; then
+ mptcp_lib_kill_wait "${client_evts_pid}"
+ fi
+ ip netns exec "${ns_2}" ./pm_nl_ctl events >> "${client_evts}" 2>&1 &
+ client_evts_pid=$!
+}
+
+mptcp_lib_evts_kill() {
+ : "${server_evts_pid:?}"
+ : "${client_evts_pid:?}"
+
+ mptcp_lib_kill_wait "${server_evts_pid}"
+ mptcp_lib_kill_wait "${client_evts_pid}"
+
+ server_evts_pid=0
+ client_evts_pid=0
+}
+
+mptcp_lib_evts_remove() {
+ : "${server_evts:?}"
+ : "${client_evts:?}"
+
+ rm -rf "${server_evts}" "${client_evts}"
+}
+
mptcp_lib_cleanup() {
: "${check_output_err:?}"
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index b2b132f61f1f..e78fcd3bff16 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -34,10 +34,6 @@ AF_INET=2
AF_INET6=10
file=""
-server_evts=""
-client_evts=""
-server_evts_pid=0
-client_evts_pid=0
client4_pid=0
server4_pid=0
client6_pid=0
@@ -115,18 +111,19 @@ cleanup()
# Terminate the MPTCP connection and related processes
local pid
- for pid in $client4_pid $server4_pid $client6_pid $server6_pid\
- $server_evts_pid $client_evts_pid
+ for pid in $client4_pid $server4_pid $client6_pid $server6_pid
do
mptcp_lib_kill_wait $pid
done
+ mptcp_lib_evts_kill
local netns
for netns in "$ns1" "$ns2" ;do
ip netns del "$netns"
done
- rm -rf $file $client_evts $server_evts
+ rm -rf $file
+ mptcp_lib_evts_remove
mptcp_lib_cleanup
_printf "Done\n"
@@ -186,24 +183,8 @@ make_connection()
# Capture netlink events over the two network namespaces running
# the MPTCP client and server
- if [ -z "$client_evts" ]; then
- client_evts=$(mktemp)
- fi
- :>"$client_evts"
- if [ $client_evts_pid -ne 0 ]; then
- mptcp_lib_kill_wait $client_evts_pid
- fi
- ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 &
- client_evts_pid=$!
- if [ -z "$server_evts" ]; then
- server_evts=$(mktemp)
- fi
- :>"$server_evts"
- if [ $server_evts_pid -ne 0 ]; then
- mptcp_lib_kill_wait $server_evts_pid
- fi
- ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 &
- server_evts_pid=$!
+ mptcp_lib_evts_init
+ mptcp_lib_evts_start "${ns1}" "${ns2}"
sleep 0.5
# Run the server
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 02/33] selftests: mptcp: userspace: capitalize test_name
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 03/33] selftests: mptcp: userspace: print colored output Geliang Tang
` (30 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Most scripts use uppercase variable TEST_NAME, but lowercase one are
used in userspace_pm.sh. To maintain consistency with other scripts,
this patch renames variable test_name to TEST_NAME:
test_name -> TEST_NAME in userspace_pm.sh
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/userspace_pm.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index e78fcd3bff16..c9da970e5d24 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -54,7 +54,7 @@ sec=$(date +%s)
rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
-test_name=""
+TEST_NAME=""
_printf() {
stdbuf -o0 -e0 printf "${@}"
@@ -68,9 +68,9 @@ print_title()
# $1: test name
print_test()
{
- test_name="${1}"
+ TEST_NAME="${1}"
- _printf "%-63s" "${test_name}"
+ _printf "%-63s" "${TEST_NAME}"
}
print_results()
@@ -81,13 +81,13 @@ print_results()
test_pass()
{
print_results " OK "
- mptcp_lib_result_pass "${test_name}"
+ mptcp_lib_result_pass "${TEST_NAME}"
}
test_skip()
{
print_results "SKIP"
- mptcp_lib_result_skip "${test_name}"
+ mptcp_lib_result_skip "${TEST_NAME}"
}
# $1: msg
@@ -100,7 +100,7 @@ test_fail()
_printf "\t%s\n" "${1}"
fi
- mptcp_lib_result_fail "${test_name}"
+ mptcp_lib_result_fail "${TEST_NAME}"
}
# This function is used in the cleanup trap
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 03/33] selftests: mptcp: userspace: print colored output
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 02/33] selftests: mptcp: userspace: capitalize test_name Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 04/33] selftests: mptcp: capitalize ok/fail/skip Geliang Tang
` (29 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang, Matthieu Baerts
The helper mptcp_lib_verify_listener_events() will be added latter in
mptcp_lib.sh, and be used by mptcp_join.sh and userspace_pm.sh. The
former prints colored output while the latter is not. It makes sense
to unify them.
Use mptcp_lib_print_ok(), _warn() and _err() to instead print_results()
in test_pass(), _skip() and _fail(), and use mptcp_lib_print_info() to
instead _printf() in print_title() to print test results with colors
in userspace_pm.sh.
Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/userspace_pm.sh | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index c9da970e5d24..108a7548a1ed 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -62,7 +62,7 @@ _printf() {
print_title()
{
- _printf "INFO: %s\n" "${1}"
+ mptcp_lib_print_info "INFO: ${1}"
}
# $1: test name
@@ -73,27 +73,22 @@ print_test()
_printf "%-63s" "${TEST_NAME}"
}
-print_results()
-{
- _printf "[%s]\n" "${1}"
-}
-
test_pass()
{
- print_results " OK "
+ mptcp_lib_print_ok "[ OK ]${1:+ ${*}}"
mptcp_lib_result_pass "${TEST_NAME}"
}
test_skip()
{
- print_results "SKIP"
+ mptcp_lib_print_warn "[ SKIP ]${1:+ ${*}}"
mptcp_lib_result_skip "${TEST_NAME}"
}
# $1: msg
test_fail()
{
- print_results "FAIL"
+ mptcp_lib_print_err "[ FAIL ]${1:+ ${*}}"
ret=1
if [ -n "${1}" ]; then
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 04/33] selftests: mptcp: capitalize ok/fail/skip
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (2 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 03/33] selftests: mptcp: userspace: print colored output Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 05/33] selftests: mptcp: extract mptcp_lib_check_expected Geliang Tang
` (28 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Most scripts print uppercase [ OK ], [ FAIL ] and [ SKIP ] as test results,
but lowercase ones are used in diag.sh, mptcp_join.sh and simult_flows.sh.
To maintain consistency with other scripts, this patch capitalizes these
lowercase [ ok ], [ fail ] and [ skip ]:
[ ok ] -> [ OK ] in diag.sh, mptcp_join.sh
[ fail ] -> [ FAIL ] in diag.sh, mptcp_join.sh, simult_flows.sh
[ skip ] -> [ SKIP ] in diag.sh, mptcp_join.sh
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------
tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++---
tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 0734bd9b54b8..300aec419dd6 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -64,15 +64,15 @@ __chk_nr()
printf "%-50s" "$msg"
if [ $nr != $expected ]; then
if [ $nr = "$skip" ] && ! mptcp_lib_expect_all_features; then
- echo "[ skip ] Feature probably not supported"
+ echo "[ SKIP ] Feature probably not supported"
mptcp_lib_result_skip "${msg}"
else
- echo "[ fail ] expected $expected found $nr"
+ echo "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg}"
ret=$test_cnt
fi
else
- echo "[ ok ]"
+ echo "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
test_cnt=$((test_cnt+1))
@@ -113,15 +113,15 @@ wait_msk_nr()
printf "%-50s" "$msg"
if [ $i -ge $timeout ]; then
- echo "[ fail ] timeout while expecting $expected max $max last $nr"
+ echo "[ FAIL ] timeout while expecting $expected max $max last $nr"
mptcp_lib_result_fail "${msg} # timeout"
ret=$test_cnt
elif [ $nr != $expected ]; then
- echo "[ fail ] expected $expected found $nr"
+ echo "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg} # unexpected result"
ret=$test_cnt
else
- echo "[ ok ]"
+ echo "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
test_cnt=$((test_cnt+1))
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b586bc404668..54af4e4737bd 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -217,17 +217,17 @@ print_info()
print_ok()
{
- mptcp_lib_print_ok "[ ok ]${1:+ ${*}}"
+ mptcp_lib_print_ok "[ OK ]${1:+ ${*}}"
}
print_fail()
{
- mptcp_lib_print_err "[fail]${1:+ ${*}}"
+ mptcp_lib_print_err "[ FAIL ]${1:+ ${*}}"
}
print_skip()
{
- mptcp_lib_print_warn "[skip]${1:+ ${*}}"
+ mptcp_lib_print_warn "[ SKIP ]${1:+ ${*}}"
}
# [ $1: fail msg ]
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 0c211496e611..3536c7160ce5 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -194,7 +194,7 @@ do_transfer()
return 0
fi
- echo " [ fail ]"
+ echo " [ FAIL ]"
echo "client exit code $retc, server $rets" 1>&2
echo -e "\nnetns ${ns3} socket stat for $port:" 1>&2
ip netns exec ${ns3} ss -nita 1>&2 -o "sport = :$port"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 05/33] selftests: mptcp: extract mptcp_lib_check_expected
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (3 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 04/33] selftests: mptcp: capitalize ok/fail/skip Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 06/33] selftests: mptcp: export event macros in mptcp_lib Geliang Tang
` (27 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Extract the main part of check_expected() in userspace_pm.sh to a new
function mptcp_lib_check_expected() in mptcp_lib.sh. It will be used
in both mptcp_john.sh and userspace_pm.sh.
check_expected_one() is moved into mptcp_lib.sh too as a sub function
of mptcp_lib_check_expected().
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_lib.sh | 43 +++++++++++++++++++
.../selftests/net/mptcp/userspace_pm.sh | 41 +++---------------
2 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index a41da009962f..8463bcbd9428 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -392,6 +392,49 @@ mptcp_lib_evts_remove() {
rm -rf "${server_evts}" "${client_evts}"
}
+# $@: all var names to check
+mptcp_lib_check_expected() {
+ : "${ret:?}"
+
+ # $1: var name ; $2: prev ret
+ check_expected_one() {
+ local var="${1}"
+ local exp="e_${var}"
+ local prev_ret="${2}"
+
+ if [ "${!var}" = "${!exp}" ]
+ then
+ return 0
+ fi
+
+ if [ "${prev_ret}" = "0" ]
+ then
+ ret=${KSFT_FAIL}
+ fi
+
+ printf "\tExpected value for '%s': '%s', got '%s'.\n" \
+ "${var}" "${!exp}" "${!var}"
+ return 1
+ }
+
+ local rc=0
+ local var
+
+ for var in "${@}"
+ do
+ check_expected_one "${var}" "${rc}" || rc=1
+ done
+ unset -f check_expected_one
+
+ if [ ${rc} -eq 0 ]
+ then
+ mptcp_lib_print_ok "[ OK ]"
+ return 0
+ fi
+
+ return 1
+}
+
mptcp_lib_cleanup() {
: "${check_output_err:?}"
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 108a7548a1ed..85712f097597 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -237,46 +237,15 @@ make_connection()
fi
}
-# $1: var name ; $2: prev ret
-check_expected_one()
-{
- local var="${1}"
- local exp="e_${var}"
- local prev_ret="${2}"
-
- if [ "${!var}" = "${!exp}" ]
- then
- return 0
- fi
-
- if [ "${prev_ret}" = "0" ]
- then
- test_fail
- fi
-
- _printf "\tExpected value for '%s': '%s', got '%s'.\n" \
- "${var}" "${!exp}" "${!var}"
- return 1
-}
-
# $@: all var names to check
check_expected()
{
- local rc=0
- local var
-
- for var in "${@}"
- do
- check_expected_one "${var}" "${rc}" || rc=1
- done
-
- if [ ${rc} -eq 0 ]
- then
- test_pass
- return 0
+ mptcp_lib_check_expected ${*}
+ if [ $? -eq 0 ]; then
+ mptcp_lib_result_pass "${TEST_NAME}"
+ else
+ test_fail
fi
-
- return 1
}
verify_announce_event()
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 06/33] selftests: mptcp: export event macros in mptcp_lib
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (4 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 05/33] selftests: mptcp: extract mptcp_lib_check_expected Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 07/33] selftests: mptcp: add mptcp_lib_verify_listener_events Geliang Tang
` (26 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
SUB_ESTABLISHED, LISTENER_CREATED, LISTENER_CLOSED, AF_INET and AF_INET6
are defined in both mptcp_join.sh and userspace_pm.sh, export all event
macros into mptcp_lib.sh. Add MPTCP_LIB_ prefix for the first three and
add readonly for the last two.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 23 ++--
.../testing/selftests/net/mptcp/mptcp_lib.sh | 10 ++
.../selftests/net/mptcp/userspace_pm.sh | 121 +++++++++---------
3 files changed, 79 insertions(+), 75 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 54af4e4737bd..93074a76038f 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2813,13 +2813,6 @@ backup_tests()
fi
}
-SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
-LISTENER_CREATED=15 #MPTCP_EVENT_LISTENER_CREATED
-LISTENER_CLOSED=16 #MPTCP_EVENT_LISTENER_CLOSED
-
-AF_INET=2
-AF_INET6=10
-
verify_listener_events()
{
local evt=$1
@@ -2833,9 +2826,9 @@ verify_listener_events()
local sport
local name
- if [ $e_type = $LISTENER_CREATED ]; then
+ if [ $e_type = $MPTCP_LIB_LISTENER_CREATED ]; then
name="LISTENER_CREATED"
- elif [ $e_type = $LISTENER_CLOSED ]; then
+ elif [ $e_type = $MPTCP_LIB_LISTENER_CLOSED ]; then
name="LISTENER_CLOSED "
else
name="$e_type"
@@ -2902,8 +2895,10 @@ add_addr_ports_tests()
chk_add_nr 1 1 1
chk_rm_nr 1 1 invert
- verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 10100
- verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 10100
+ verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CREATED \
+ $AF_INET 10.0.2.1 10100
+ verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CLOSED \
+ $AF_INET 10.0.2.1 10100
mptcp_lib_evts_kill
fi
@@ -3433,9 +3428,9 @@ userspace_tests()
chk_mptcp_info add_addr_signal 1 add_addr_accepted 1
if [ $((RANDOM%2)) -eq 0 ]; then
userspace_pm_rm_addr $ns1 10
- userspace_pm_rm_sf $ns1 ::ffff:10.0.2.1 $SUB_ESTABLISHED
+ userspace_pm_rm_sf $ns1 ::ffff:10.0.2.1 $MPTCP_LIB_SUB_ESTABLISHED
else
- userspace_pm_rm_sf $ns1 10.0.2.1 $SUB_ESTABLISHED
+ userspace_pm_rm_sf $ns1 10.0.2.1 $MPTCP_LIB_SUB_ESTABLISHED
userspace_pm_rm_addr $ns1 10
fi
chk_rm_nr 1 1 invert
@@ -3459,7 +3454,7 @@ userspace_tests()
chk_mptcp_info subflows 1 subflows 1
chk_subflows_total 2 2
userspace_pm_rm_addr $ns2 20
- userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED
+ userspace_pm_rm_sf $ns2 10.0.3.2 $MPTCP_LIB_SUB_ESTABLISHED
chk_rm_nr 1 1
chk_mptcp_info subflows 0 subflows 0
chk_subflows_total 1 1
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 8463bcbd9428..b381730e832a 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -10,6 +10,16 @@ readonly KSFT_TEST=$(basename "${0}" | sed 's/\.sh$//g')
ret=0
+MPTCP_LIB_ANNOUNCED=6 # MPTCP_EVENT_ANNOUNCED
+MPTCP_LIB_REMOVED=7 # MPTCP_EVENT_REMOVED
+MPTCP_LIB_SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
+MPTCP_LIB_SUB_CLOSED=11 # MPTCP_EVENT_SUB_CLOSED
+MPTCP_LIB_LISTENER_CREATED=15 #MPTCP_EVENT_LISTENER_CREATED
+MPTCP_LIB_LISTENER_CLOSED=16 #MPTCP_EVENT_LISTENER_CLOSED
+
+readonly AF_INET=2
+readonly AF_INET6=10
+
MPTCP_LIB_SUBTESTS=()
# only if supported (or forced) and not disabled, see no-color.org
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 85712f097597..9b1d8b56d8d6 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -23,16 +23,6 @@ if ! ip -Version &> /dev/null; then
exit ${KSFT_SKIP}
fi
-ANNOUNCED=6 # MPTCP_EVENT_ANNOUNCED
-REMOVED=7 # MPTCP_EVENT_REMOVED
-SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
-SUB_CLOSED=11 # MPTCP_EVENT_SUB_CLOSED
-LISTENER_CREATED=15 #MPTCP_EVENT_LISTENER_CREATED
-LISTENER_CLOSED=16 #MPTCP_EVENT_LISTENER_CLOSED
-
-AF_INET=2
-AF_INET6=10
-
file=""
client4_pid=0
server4_pid=0
@@ -306,8 +296,8 @@ test_announce()
ns2eth1
print_test "ADD_ADDR id:${client_addr_id} 10.0.2.2 (ns2) => ns1, reuse port"
sleep 0.5
- verify_announce_event $server_evts $ANNOUNCED $server4_token "10.0.2.2" $client_addr_id \
- "$client4_port"
+ verify_announce_event $server_evts $MPTCP_LIB_ANNOUNCED $server4_token \
+ "10.0.2.2" $client_addr_id "$client4_port"
# ADD_ADDR6 from the client to server machine reusing the subflow port
:>"$server_evts"
@@ -315,8 +305,8 @@ test_announce()
dead:beef:2::2 token "$client6_token" id $client_addr_id dev ns2eth1
print_test "ADD_ADDR6 id:${client_addr_id} dead:beef:2::2 (ns2) => ns1, reuse port"
sleep 0.5
- verify_announce_event "$server_evts" "$ANNOUNCED" "$server6_token" "dead:beef:2::2"\
- "$client_addr_id" "$client6_port" "v6"
+ verify_announce_event "$server_evts" "$MPTCP_LIB_ANNOUNCED" "$server6_token" \
+ "dead:beef:2::2" "$client_addr_id" "$client6_port" "v6"
# ADD_ADDR from the client to server machine using a new port
:>"$server_evts"
@@ -325,7 +315,7 @@ test_announce()
$client_addr_id dev ns2eth1 port $new4_port
print_test "ADD_ADDR id:${client_addr_id} 10.0.2.2 (ns2) => ns1, new port"
sleep 0.5
- verify_announce_event "$server_evts" "$ANNOUNCED" "$server4_token" "10.0.2.2"\
+ verify_announce_event "$server_evts" "$MPTCP_LIB_ANNOUNCED" "$server4_token" "10.0.2.2"\
"$client_addr_id" "$new4_port"
# Capture events on the network namespace running the client
@@ -336,7 +326,7 @@ test_announce()
$server_addr_id dev ns1eth2
print_test "ADD_ADDR id:${server_addr_id} 10.0.2.1 (ns1) => ns2, reuse port"
sleep 0.5
- verify_announce_event "$client_evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\
+ verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client4_token" "10.0.2.1"\
"$server_addr_id" "$app4_port"
# ADD_ADDR6 from the server to client machine reusing the subflow port
@@ -345,8 +335,8 @@ test_announce()
$server_addr_id dev ns1eth2
print_test "ADD_ADDR6 id:${server_addr_id} dead:beef:2::1 (ns1) => ns2, reuse port"
sleep 0.5
- verify_announce_event "$client_evts" "$ANNOUNCED" "$client6_token" "dead:beef:2::1"\
- "$server_addr_id" "$app6_port" "v6"
+ verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client6_token" \
+ "dead:beef:2::1" "$server_addr_id" "$app6_port" "v6"
# ADD_ADDR from the server to client machine using a new port
:>"$client_evts"
@@ -355,7 +345,7 @@ test_announce()
$server_addr_id dev ns1eth2 port $new4_port
print_test "ADD_ADDR id:${server_addr_id} 10.0.2.1 (ns1) => ns2, new port"
sleep 0.5
- verify_announce_event "$client_evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\
+ verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client4_token" "10.0.2.1"\
"$server_addr_id" "$new4_port"
}
@@ -416,7 +406,7 @@ test_remove()
$client_addr_id
print_test "RM_ADDR id:${client_addr_id} ns2 => ns1"
sleep 0.5
- verify_remove_event "$server_evts" "$REMOVED" "$server4_token" "$client_addr_id"
+ verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server4_token" "$client_addr_id"
# RM_ADDR from the client to server machine
:>"$server_evts"
@@ -425,7 +415,7 @@ test_remove()
$client_addr_id
print_test "RM_ADDR id:${client_addr_id} ns2 => ns1"
sleep 0.5
- verify_remove_event "$server_evts" "$REMOVED" "$server4_token" "$client_addr_id"
+ verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server4_token" "$client_addr_id"
# RM_ADDR6 from the client to server machine
:>"$server_evts"
@@ -433,7 +423,7 @@ test_remove()
$client_addr_id
print_test "RM_ADDR6 id:${client_addr_id} ns2 => ns1"
sleep 0.5
- verify_remove_event "$server_evts" "$REMOVED" "$server6_token" "$client_addr_id"
+ verify_remove_event "$server_evts" "$MPTCP_LIB_REMOVED" "$server6_token" "$client_addr_id"
# Capture events on the network namespace running the client
:>"$client_evts"
@@ -443,7 +433,7 @@ test_remove()
$server_addr_id
print_test "RM_ADDR id:${server_addr_id} ns1 => ns2"
sleep 0.5
- verify_remove_event "$client_evts" "$REMOVED" "$client4_token" "$server_addr_id"
+ verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client4_token" "$server_addr_id"
# RM_ADDR from the server to client machine
:>"$client_evts"
@@ -452,7 +442,7 @@ test_remove()
$server_addr_id
print_test "RM_ADDR id:${server_addr_id} ns1 => ns2"
sleep 0.5
- verify_remove_event "$client_evts" "$REMOVED" "$client4_token" "$server_addr_id"
+ verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client4_token" "$server_addr_id"
# RM_ADDR6 from the server to client machine
:>"$client_evts"
@@ -460,7 +450,7 @@ test_remove()
$server_addr_id
print_test "RM_ADDR6 id:${server_addr_id} ns1 => ns2"
sleep 0.5
- verify_remove_event "$client_evts" "$REMOVED" "$client6_token" "$server_addr_id"
+ verify_remove_event "$client_evts" "$MPTCP_LIB_REMOVED" "$client6_token" "$server_addr_id"
}
verify_subflow_events()
@@ -489,7 +479,7 @@ verify_subflow_events()
info="${e_saddr} (${e_from}) => ${e_daddr} (${e_to})"
- if [ "$e_type" = "$SUB_ESTABLISHED" ]
+ if [ "$e_type" = "$MPTCP_LIB_SUB_ESTABLISHED" ]
then
if [ "$e_family" = "$AF_INET6" ]
then
@@ -546,22 +536,24 @@ test_subflows()
ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\
rport "$client4_port" token "$server4_token"
sleep 0.5
- verify_subflow_events $server_evts $SUB_ESTABLISHED $server4_token $AF_INET "10.0.2.1" \
- "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2"
+ verify_subflow_events $server_evts $MPTCP_LIB_SUB_ESTABLISHED $server4_token \
+ $AF_INET "10.0.2.1" "10.0.2.2" "$client4_port" "23" \
+ "$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
mptcp_lib_kill_wait $listener_pid
local sport
- sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW from server to client machine
:>"$server_evts"
ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0.2.2 rport\
"$client4_port" token "$server4_token"
sleep 0.5
- verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server4_token" "$AF_INET" "10.0.2.1"\
- "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2"
+ verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server4_token" \
+ "$AF_INET" "10.0.2.1" "10.0.2.2" "$client4_port" "23" \
+ "$client_addr_id" "ns1" "ns2"
# RM_ADDR from client to server machine
ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\
@@ -584,21 +576,21 @@ test_subflows()
ip netns exec "$ns1" ./pm_nl_ctl csf lip dead:beef:2::1 lid 23 rip\
dead:beef:2::2 rport "$client6_port" token "$server6_token"
sleep 0.5
- verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server6_token" "$AF_INET6"\
- "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\
- "$client_addr_id" "ns1" "ns2"
+ verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$server6_token" \
+ "$AF_INET6" "dead:beef:2::1" "dead:beef:2::2" "$client6_port" \
+ "23" "$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW6 from server to client machine
:>"$server_evts"
ip netns exec "$ns1" ./pm_nl_ctl dsf lip dead:beef:2::1 lport "$sport" rip\
dead:beef:2::2 rport "$client6_port" token "$server6_token"
sleep 0.5
- verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server6_token" "$AF_INET6"\
+ verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server6_token" "$AF_INET6"\
"dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\
"$client_addr_id" "ns1" "ns2"
@@ -623,22 +615,23 @@ test_subflows()
ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rport\
$new4_port token "$server4_token"
sleep 0.5
- verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server4_token" "$AF_INET"\
- "10.0.2.1" "10.0.2.2" "$new4_port" "23"\
+ verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$server4_token" \
+ "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \
"$client_addr_id" "ns1" "ns2"
# Delete the listener from the client ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW from server to client machine
:>"$server_evts"
ip netns exec "$ns1" ./pm_nl_ctl dsf lip 10.0.2.1 lport "$sport" rip 10.0.2.2 rport\
$new4_port token "$server4_token"
sleep 0.5
- verify_subflow_events "$server_evts" "$SUB_CLOSED" "$server4_token" "$AF_INET" "10.0.2.1"\
- "10.0.2.2" "$new4_port" "23" "$client_addr_id" "ns1" "ns2"
+ verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_CLOSED" "$server4_token" \
+ "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \
+ "$client_addr_id" "ns1" "ns2"
# RM_ADDR from client to server machine
ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\
@@ -662,21 +655,22 @@ test_subflows()
ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rport\
$app4_port token "$client4_token"
sleep 0.5
- verify_subflow_events $client_evts $SUB_ESTABLISHED $client4_token $AF_INET "10.0.2.2"\
- "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1"
+ verify_subflow_events $client_evts $MPTCP_LIB_SUB_ESTABLISHED $client4_token $AF_INET \
+ "10.0.2.2" "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW from client to server machine
:>"$client_evts"
ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0.2.1 rport\
$app4_port token "$client4_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_CLOSED" "$client4_token" "$AF_INET" "10.0.2.2"\
- "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1"
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_CLOSED" "$client4_token" \
+ "$AF_INET" "10.0.2.2" "10.0.2.1" "$app4_port" "23" \
+ "$server_addr_id" "ns2" "ns1"
# RM_ADDR from server to client machine
ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\
@@ -699,7 +693,7 @@ test_subflows()
ip netns exec "$ns2" ./pm_nl_ctl csf lip dead:beef:2::2 lid 23 rip\
dead:beef:2::1 rport $app6_port token "$client6_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$client6_token"\
"$AF_INET6" "dead:beef:2::2"\
"dead:beef:2::1" "$app6_port" "23"\
"$server_addr_id" "ns2" "ns1"
@@ -707,15 +701,16 @@ test_subflows()
# Delete the listener from the server ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW6 from client to server machine
:>"$client_evts"
ip netns exec "$ns2" ./pm_nl_ctl dsf lip dead:beef:2::2 lport "$sport" rip\
dead:beef:2::1 rport $app6_port token "$client6_token"
sleep 0.5
- verify_subflow_events $client_evts $SUB_CLOSED $client6_token $AF_INET6 "dead:beef:2::2"\
- "dead:beef:2::1" "$app6_port" "23" "$server_addr_id" "ns2" "ns1"
+ verify_subflow_events $client_evts $MPTCP_LIB_SUB_CLOSED $client6_token \
+ $AF_INET6 "dead:beef:2::2" "dead:beef:2::1" "$app6_port" \
+ "23" "$server_addr_id" "ns2" "ns1"
# RM_ADDR6 from server to client machine
ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\
@@ -738,21 +733,23 @@ test_subflows()
ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rport\
$new4_port token "$client4_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client4_token" "$AF_INET"\
- "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1"
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$client4_token" \
+ "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \
+ "$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW from client to server machine
:>"$client_evts"
ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0.2.1 rport\
$new4_port token "$client4_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_CLOSED" "$client4_token" "$AF_INET" "10.0.2.2"\
- "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1"
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_CLOSED" "$client4_token" \
+ "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \
+ "$server_addr_id" "ns2" "ns1"
# RM_ADDR from server to client machine
ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\
@@ -775,7 +772,7 @@ test_subflows_v4_v6_mix()
$server_addr_id dev ns1eth2
print_test "ADD_ADDR4 id:${server_addr_id} 10.0.2.1 (ns1) => ns2, reuse port"
sleep 0.5
- verify_announce_event "$client_evts" "$ANNOUNCED" "$client6_token" "10.0.2.1"\
+ verify_announce_event "$client_evts" "$MPTCP_LIB_ANNOUNCED" "$client6_token" "10.0.2.1"\
"$server_addr_id" "$app6_port"
# CREATE_SUBFLOW from client to server machine
@@ -783,21 +780,21 @@ test_subflows_v4_v6_mix()
ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rport\
$app6_port token "$client6_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$client6_token"\
"$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\
"$server_addr_id" "ns2" "ns1"
# Delete the listener from the server ns, if one was created
mptcp_lib_kill_wait $listener_pid
- sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
+ sport=$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_ESTABLISHED)
# DESTROY_SUBFLOW from client to server machine
:>"$client_evts"
ip netns exec "$ns2" ./pm_nl_ctl dsf lip 10.0.2.2 lport "$sport" rip 10.0.2.1 rport\
$app6_port token "$client6_token"
sleep 0.5
- verify_subflow_events "$client_evts" "$SUB_CLOSED" "$client6_token" \
+ verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_CLOSED" "$client6_token" \
"$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\
"$server_addr_id" "ns2" "ns1"
@@ -889,7 +886,8 @@ test_listener()
local listener_pid=$!
sleep 0.5
- verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $client4_port
+ verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CREATED \
+ $AF_INET 10.0.2.2 $client4_port
# ADD_ADDR from client to server machine reusing the subflow port
ip netns exec $ns2 ./pm_nl_ctl ann 10.0.2.2 token $client4_token id\
@@ -905,7 +903,8 @@ test_listener()
mptcp_lib_kill_wait $listener_pid
sleep 0.5
- verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $client4_port
+ verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CLOSED \
+ $AF_INET 10.0.2.2 $client4_port
}
print_title "Make connections"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 07/33] selftests: mptcp: add mptcp_lib_verify_listener_events
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (5 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 06/33] selftests: mptcp: export event macros in mptcp_lib Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 08/33] selftests: mptcp: unify namespace names Geliang Tang
` (25 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
To avoid duplicated code in different MPTCP selftests, we can add and use
helpers defined in mptcp_lib.sh.
The helper verify_listener_events() is defined both in mptcp_join.sh and
userspace_pm.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_
prefix. Use this new helper in both scripts.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 24 ++-------------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 23 ++++++++++++++
.../selftests/net/mptcp/userspace_pm.sh | 30 ++++---------------
3 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 93074a76038f..0fb76e963cfd 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -2815,15 +2815,10 @@ backup_tests()
verify_listener_events()
{
- local evt=$1
local e_type=$2
local e_family=$3
local e_saddr=$4
local e_sport=$5
- local type
- local family
- local saddr
- local sport
local name
if [ $e_type = $MPTCP_LIB_LISTENER_CREATED ]; then
@@ -2841,23 +2836,8 @@ verify_listener_events()
return
fi
- type=$(mptcp_lib_evts_get_info type "$evt" "$e_type")
- family=$(mptcp_lib_evts_get_info family "$evt" "$e_type")
- sport=$(mptcp_lib_evts_get_info sport "$evt" "$e_type")
- if [ $family ] && [ $family = $AF_INET6 ]; then
- saddr=$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type")
- else
- saddr=$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type")
- fi
-
- if [ $type ] && [ $type = $e_type ] &&
- [ $family ] && [ $family = $e_family ] &&
- [ $saddr ] && [ $saddr = $e_saddr ] &&
- [ $sport ] && [ $sport = $e_sport ]; then
- print_ok
- return 0
- fi
- fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$sport"
+ mptcp_lib_verify_listener_events ${*}
+ [ $? -eq 1 ] && fail_test "$e_type $e_family $e_saddr $e_sport"
}
add_addr_ports_tests()
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index b381730e832a..198e3b3a8439 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -445,6 +445,29 @@ mptcp_lib_check_expected() {
return 1
}
+mptcp_lib_verify_listener_events() {
+ local evt=$1
+ local e_type=$2
+ local e_family=$3
+ local e_saddr=$4
+ local e_sport=$5
+ local type
+ local family
+ local saddr
+ local sport
+
+ type=$(mptcp_lib_evts_get_info type "$evt" "$e_type")
+ family=$(mptcp_lib_evts_get_info family "$evt" "$e_type")
+ if [ $family ] && [ $family = $AF_INET6 ]; then
+ saddr=$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type")
+ else
+ saddr=$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type")
+ fi
+ sport=$(mptcp_lib_evts_get_info sport "$evt" "$e_type")
+
+ mptcp_lib_check_expected "type" "family" "saddr" "sport"
+}
+
mptcp_lib_cleanup() {
: "${check_output_err:?}"
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 9b1d8b56d8d6..e78a79da3960 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -839,32 +839,12 @@ test_prio()
verify_listener_events()
{
- local evt=$1
- local e_type=$2
- local e_family=$3
- local e_saddr=$4
- local e_sport=$5
- local type
- local family
- local saddr
- local sport
-
- if [ $e_type = $LISTENER_CREATED ]; then
- print_test "CREATE_LISTENER $e_saddr:$e_sport"
- elif [ $e_type = $LISTENER_CLOSED ]; then
- print_test "CLOSE_LISTENER $e_saddr:$e_sport"
- fi
-
- type=$(mptcp_lib_evts_get_info type $evt $e_type)
- family=$(mptcp_lib_evts_get_info family $evt $e_type)
- sport=$(mptcp_lib_evts_get_info sport $evt $e_type)
- if [ $family ] && [ $family = $AF_INET6 ]; then
- saddr=$(mptcp_lib_evts_get_info saddr6 $evt $e_type)
+ mptcp_lib_verify_listener_events ${*}
+ if [ $? -eq 0 ]; then
+ mptcp_lib_result_pass "${TEST_NAME}"
else
- saddr=$(mptcp_lib_evts_get_info saddr4 $evt $e_type)
+ test_fail
fi
-
- check_expected "type" "family" "saddr" "sport"
}
test_listener()
@@ -880,6 +860,7 @@ test_listener()
# Capture events on the network namespace running the client
:>$client_evts
+ print_test "Listener event LISTENER_CREATED 10.0.2.2:$client4_port"
# Attempt to add a listener at 10.0.2.2:<subflow-port>
ip netns exec $ns2 ./pm_nl_ctl listen 10.0.2.2\
$client4_port &
@@ -899,6 +880,7 @@ test_listener()
rport $client4_port token $server4_token
sleep 0.5
+ print_test "Listener event LISTENER_CLOSED 10.0.2.2:$client4_port"
# Delete the listener from the client ns, if one was created
mptcp_lib_kill_wait $listener_pid
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 08/33] selftests: mptcp: unify namespace names
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (6 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 07/33] selftests: mptcp: add mptcp_lib_verify_listener_events Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 09/33] selftests: mptcp: add mptcp_lib_ns_* helpers Geliang Tang
` (24 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Most scripts use ns1, ns2, ns3 and ns4 as namespace names, but ns and
ns_sbox are used in diag.sh and mptcp_sockopt.sh. To maintain consistency
with other scripts, this patch renames these variables:
ns -> ns1 in diag.sh
ns_sbox -> ns3 in mptcp_sockopt.sh
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 46 +++++++++----------
.../selftests/net/mptcp/mptcp_sockopt.sh | 12 ++---
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 300aec419dd6..bc3f24c454be 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,7 +5,7 @@
sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns="ns1-$rndh"
+ns1="ns1-$rndh"
ksft_skip=4
test_cnt=1
timeout_poll=100
@@ -17,19 +17,19 @@ flush_pids()
# give it some time
sleep 1.1
- ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null
+ ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null
for _ in $(seq 10); do
- [ -z "$(ip netns pids "${ns}")" ] && break
+ [ -z "$(ip netns pids "${ns1}")" ] && break
sleep 0.1
done
}
cleanup()
{
- ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null
+ ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null
- ip netns del $ns
+ ip netns del $ns1
mptcp_lib_cleanup
}
@@ -48,7 +48,7 @@ fi
get_msk_inuse()
{
- ip netns exec $ns cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}'
+ ip netns exec $ns1 cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}'
}
__chk_nr()
@@ -83,7 +83,7 @@ __chk_msk_nr()
local condition=$1
shift 1
- __chk_nr "ss -inmHMN $ns | $condition" "$@"
+ __chk_nr "ss -inmHMN $ns1 | $condition" "$@"
}
chk_msk_nr()
@@ -104,7 +104,7 @@ wait_msk_nr()
msg=$*
while [ $i -lt $timeout ]; do
- nr=$(ss -inmHMN $ns | $condition)
+ nr=$(ss -inmHMN $ns1 | $condition)
[ $nr == $expected ] && break;
[ $nr -gt $max ] && max=$nr
i=$((i + 1))
@@ -143,7 +143,7 @@ __chk_listen()
local expected=$2
local msg="$3"
- __chk_nr "ss -N $ns -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0
+ __chk_nr "ss -N $ns1 -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0
}
chk_msk_listen()
@@ -169,7 +169,7 @@ chk_msk_inuse()
local msg="$2"
local listen_nr
- listen_nr=$(ss -N "${ns}" -Ml | grep -c LISTEN)
+ listen_nr=$(ss -N "${ns1}" -Ml | grep -c LISTEN)
expected=$((expected + listen_nr))
for _ in $(seq 10); do
@@ -197,24 +197,24 @@ wait_connected()
}
trap cleanup EXIT
-ip netns add $ns
-ip -n $ns link set dev lo up
+ip netns add $ns1
+ip -n $ns1 link set dev lo up
echo "a" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \
0.0.0.0 >/dev/null &
-mptcp_lib_wait_local_port_listen $ns 10000
+mptcp_lib_wait_local_port_listen $ns1 10000
chk_msk_nr 0 "no msk on netns creation"
chk_msk_listen 10000
echo "b" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} -w 20 \
127.0.0.1 >/dev/null &
-wait_connected $ns 10000
+wait_connected $ns1 10000
chk_msk_nr 2 "after MPC handshake "
chk_msk_remote_key_nr 2 "....chk remote_key"
chk_msk_fallback_nr 0 "....chk no fallback"
@@ -225,16 +225,16 @@ chk_msk_inuse 0 "....chk 0 msk in use after flush"
echo "a" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \
0.0.0.0 >/dev/null &
-mptcp_lib_wait_local_port_listen $ns 10001
+mptcp_lib_wait_local_port_listen $ns1 10001
echo "b" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} -w 20 \
127.0.0.1 >/dev/null &
-wait_connected $ns 10001
+wait_connected $ns1 10001
chk_msk_fallback_nr 1 "check fallback"
chk_msk_inuse 1 "....chk 1 msk in use"
flush_pids
@@ -245,16 +245,16 @@ NR_CLIENTS=100
for I in `seq 1 $NR_CLIENTS`; do
echo "a" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p $((I+10001)) -l -w 20 \
-t ${timeout_poll} 0.0.0.0 >/dev/null &
done
-mptcp_lib_wait_local_port_listen $ns $((NR_CLIENTS + 10001))
+mptcp_lib_wait_local_port_listen $ns1 $((NR_CLIENTS + 10001))
for I in `seq 1 $NR_CLIENTS`; do
echo "b" | \
timeout ${timeout_test} \
- ip netns exec $ns \
+ ip netns exec $ns1 \
./mptcp_connect -p $((I+10001)) -w 20 \
-t ${timeout_poll} 127.0.0.1 >/dev/null &
done
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 45e5b5810a6a..b82f7b0b85bc 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -17,7 +17,7 @@ sec=$(date +%s)
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
ns1="ns1-$rndh"
ns2="ns2-$rndh"
-ns_sbox="ns_sbox-$rndh"
+ns3="ns3-$rndh"
add_mark_rules()
{
@@ -40,7 +40,7 @@ add_mark_rules()
init()
{
local netns
- for netns in "$ns1" "$ns2" "$ns_sbox";do
+ for netns in "$ns1" "$ns2" "$ns3";do
ip netns add $netns || exit $ksft_skip
ip -net $netns link set lo up
ip netns exec $netns sysctl -q net.mptcp.enabled=1
@@ -79,7 +79,7 @@ init()
cleanup()
{
local netns
- for netns in "$ns1" "$ns2" "$ns_sbox"; do
+ for netns in "$ns1" "$ns2" "$ns3"; do
ip netns del $netns
done
rm -f "$cin" "$cout"
@@ -240,7 +240,7 @@ do_mptcp_sockopt_tests()
return
fi
- ip netns exec "$ns_sbox" ./mptcp_sockopt
+ ip netns exec "$ns3" ./mptcp_sockopt
lret=$?
if [ $lret -ne 0 ]; then
@@ -251,7 +251,7 @@ do_mptcp_sockopt_tests()
fi
mptcp_lib_result_pass "sockopt v4"
- ip netns exec "$ns_sbox" ./mptcp_sockopt -6
+ ip netns exec "$ns3" ./mptcp_sockopt -6
lret=$?
if [ $lret -ne 0 ]; then
@@ -282,7 +282,7 @@ run_tests()
do_tcpinq_test()
{
- ip netns exec "$ns_sbox" ./mptcp_inq "$@"
+ ip netns exec "$ns3" ./mptcp_inq "$@"
local lret=$?
if [ $lret -ne 0 ];then
ret=$lret
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 09/33] selftests: mptcp: add mptcp_lib_ns_* helpers
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (7 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 08/33] selftests: mptcp: unify namespace names Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 10/33] selftests: mptcp: add ss mptcp support checks Geliang Tang
` (23 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Add helpers mptcp_lib_ns_init() and mptcp_lib_ns_exit() in mptcp_lib.sh to
init all namespaces ns1, ns2, ns3 and ns4. Then every test script can
invoke these helpers and use all namespaces.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 8 +---
.../selftests/net/mptcp/mptcp_connect.sh | 20 ++------
.../testing/selftests/net/mptcp/mptcp_join.sh | 19 +-------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 46 +++++++++++++++++++
.../selftests/net/mptcp/mptcp_sockopt.sh | 15 +-----
.../testing/selftests/net/mptcp/pm_netlink.sh | 8 +---
.../selftests/net/mptcp/simult_flows.sh | 18 +-------
.../selftests/net/mptcp/userspace_pm.sh | 12 +----
8 files changed, 62 insertions(+), 84 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index bc3f24c454be..3119811018fc 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -3,9 +3,7 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
+mptcp_lib_ns_init
ksft_skip=4
test_cnt=1
timeout_poll=100
@@ -29,7 +27,7 @@ cleanup()
{
ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null
- ip netns del $ns1
+ mptcp_lib_ns_exit
mptcp_lib_cleanup
}
@@ -197,8 +195,6 @@ wait_connected()
}
trap cleanup EXIT
-ip netns add $ns1
-ip -n $ns1 link set dev lo up
echo "a" | \
timeout ${timeout_test} \
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 5e28292e1889..e19b1fe67408 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -120,12 +120,7 @@ while getopts "$optstring" option;do
esac
done
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
-ns2="ns2-$rndh"
-ns3="ns3-$rndh"
-ns4="ns4-$rndh"
+mptcp_lib_ns_init
TEST_COUNT=0
TEST_GROUP=""
@@ -137,11 +132,7 @@ cleanup()
rm -f "$sin" "$sout"
rm -f "$capout"
- local netns
- for netns in "$ns1" "$ns2" "$ns3" "$ns4";do
- ip netns del $netns
- rm -f /tmp/$netns.{nstat,out}
- done
+ mptcp_lib_ns_exit
mptcp_lib_cleanup
}
@@ -163,11 +154,6 @@ cin_disconnect="$cin".disconnect
cout_disconnect="$cout".disconnect
trap cleanup EXIT
-for i in "$ns1" "$ns2" "$ns3" "$ns4";do
- ip netns add $i || exit $ksft_skip
- ip -net $i link set lo up
-done
-
# "$ns1" ns2 ns3 ns4
# ns1eth2 ns2eth1 ns2eth3 ns3eth2 ns3eth4 ns4eth3
# - drop 1% -> reorder 25%
@@ -256,6 +242,8 @@ fi
check_mptcp_disabled()
{
+ : "${rndh:?}"
+
local disabled_ns="ns_disabled-$rndh"
ip netns add ${disabled_ns} || exit $ksft_skip
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 0fb76e963cfd..7dec65a5ed75 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -21,8 +21,6 @@ cinsent=""
tmpfile=""
cout=""
capout=""
-ns1=""
-ns2=""
ksft_skip=4
iptables="iptables"
ip6tables="ip6tables"
@@ -80,21 +78,12 @@ init_partial()
{
capout=$(mktemp)
- local sec rndh
- sec=$(date +%s)
- rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-
- ns1="ns1-$rndh"
- ns2="ns2-$rndh"
+ mptcp_lib_ns_init
local netns
for netns in "$ns1" "$ns2"; do
- ip netns add $netns || exit $ksft_skip
- ip -net $netns link set lo up
ip netns exec $netns sysctl -q net.mptcp.enabled=1
ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true
- ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
- ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
if [ $checksum -eq 1 ]; then
ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1
fi
@@ -139,11 +128,7 @@ cleanup_partial()
{
rm -f "$capout"
- local netns
- for netns in "$ns1" "$ns2"; do
- ip netns del $netns
- rm -f /tmp/$netns.{nstat,out}
- done
+ mptcp_lib_ns_exit
}
check_tools()
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 198e3b3a8439..e8e1250e5ea6 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -468,6 +468,52 @@ mptcp_lib_verify_listener_events() {
mptcp_lib_check_expected "type" "family" "saddr" "sport"
}
+rndh=""
+ns1=""
+ns2=""
+ns3=""
+ns4=""
+
+mptcp_lib_ns_init() {
+ : "${rndh?}"
+ : "${ns1?}"
+ : "${ns2?}"
+ : "${ns3?}"
+ : "${ns4?}"
+
+ local sec
+
+ sec=$(date +%s)
+ rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
+
+ ns1="ns1-$rndh"
+ ns2="ns2-$rndh"
+ ns3="ns3-$rndh"
+ ns4="ns4-$rndh"
+
+ local netns
+ for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do
+ ip netns add $netns || exit ${ksft_skip}
+ ip -net $netns link set lo up
+
+ ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
+ ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
+ done
+}
+
+mptcp_lib_ns_exit() {
+ : "${ns1:?}"
+ : "${ns2:?}"
+ : "${ns3:?}"
+ : "${ns4:?}"
+
+ local netns
+ for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do
+ ip netns del $netns
+ rm -f /tmp/$netns.{nstat,out}
+ done
+}
+
mptcp_lib_cleanup() {
: "${check_output_err:?}"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index b82f7b0b85bc..ff49ee9b9cc2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -13,11 +13,7 @@ timeout_test=$((timeout_poll * 2 + 1))
iptables="iptables"
ip6tables="ip6tables"
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
-ns2="ns2-$rndh"
-ns3="ns3-$rndh"
+mptcp_lib_ns_init
add_mark_rules()
{
@@ -41,11 +37,7 @@ init()
{
local netns
for netns in "$ns1" "$ns2" "$ns3";do
- ip netns add $netns || exit $ksft_skip
- ip -net $netns link set lo up
ip netns exec $netns sysctl -q net.mptcp.enabled=1
- ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
- ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
done
local i
@@ -78,10 +70,7 @@ init()
cleanup()
{
- local netns
- for netns in "$ns1" "$ns2" "$ns3"; do
- ip netns del $netns
- done
+ mptcp_lib_ns_exit
rm -f "$cin" "$cout"
rm -f "$sin" "$sout"
mptcp_lib_cleanup
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index c0fc6f82a8c7..8f99b138a59f 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -23,13 +23,11 @@ while getopts "$optstring" option;do
esac
done
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
+mptcp_lib_ns_init
cleanup()
{
- ip netns del $ns1
+ mptcp_lib_ns_exit
mptcp_lib_cleanup
}
@@ -43,8 +41,6 @@ fi
trap cleanup EXIT
-ip netns add $ns1 || exit $ksft_skip
-ip -net $ns1 link set lo up
ip netns exec $ns1 sysctl -q net.mptcp.enabled=1
check()
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 3536c7160ce5..c1a21cd8c076 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -3,11 +3,7 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-sec=$(date +%s)
-rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
-ns2="ns2-$rndh"
-ns3="ns3-$rndh"
+mptcp_lib_ns_init
capture=false
ksft_skip=4
timeout_poll=30
@@ -29,10 +25,7 @@ cleanup()
rm -f "$large" "$small"
rm -f "$capout"
- local netns
- for netns in "$ns1" "$ns2" "$ns3";do
- ip netns del $netns
- done
+ mptcp_lib_ns_exit
mptcp_lib_cleanup
}
@@ -64,13 +57,6 @@ setup()
trap cleanup EXIT
- for i in "$ns1" "$ns2" "$ns3";do
- ip netns add $i || exit $ksft_skip
- ip -net $i link set lo up
- ip netns exec $i sysctl -q net.ipv4.conf.all.rp_filter=0
- ip netns exec $i sysctl -q net.ipv4.conf.default.rp_filter=0
- done
-
ip link add ns1eth1 netns "$ns1" type veth peer name ns2eth1 netns "$ns2"
ip link add ns1eth2 netns "$ns1" type veth peer name ns2eth2 netns "$ns2"
ip link add ns2eth3 netns "$ns2" type veth peer name ns3eth1 netns "$ns3"
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index e78a79da3960..93f8b200ce49 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -40,10 +40,7 @@ app6_port=50004
client_addr_id=${RANDOM:0:2}
server_addr_id=${RANDOM:0:2}
-sec=$(date +%s)
-rndh=$(printf %x "$sec")-$(mktemp -u XXXXXX)
-ns1="ns1-$rndh"
-ns2="ns2-$rndh"
+mptcp_lib_ns_init
TEST_NAME=""
_printf() {
@@ -102,10 +99,7 @@ cleanup()
done
mptcp_lib_evts_kill
- local netns
- for netns in "$ns1" "$ns2" ;do
- ip netns del "$netns"
- done
+ mptcp_lib_ns_exit
rm -rf $file
mptcp_lib_evts_remove
@@ -118,8 +112,6 @@ trap cleanup EXIT
# Create and configure network namespaces for testing
for i in "$ns1" "$ns2" ;do
- ip netns add "$i" || exit 1
- ip -net "$i" link set lo up
ip netns exec "$i" sysctl -q net.mptcp.enabled=1
ip netns exec "$i" sysctl -q net.mptcp.pm_type=1
done
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 10/33] selftests: mptcp: add ss mptcp support checks
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (8 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 09/33] selftests: mptcp: add mptcp_lib_ns_* helpers Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 11/33] selftests: mptcp: add mptcp_lib_check_tools helper Geliang Tang
` (22 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Commands 'ss -M' are used in scripts mptcp_connect.sh, mptcp_join.sh,
and mptcp_sockopt.sh to display only MPTCP sockets. So it must be checked
if ss tool supports MPTCP in these script.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ++++++
tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 ++++++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index e19b1fe67408..b554c2e9750e 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -145,6 +145,12 @@ if [ $? -ne 0 ];then
exit $ksft_skip
fi
+ss -h | grep -q MPTCP
+if [ $? -ne 0 ];then
+ echo "SKIP: ss tool does not support MPTCP"
+ exit $ksft_skip
+fi
+
sin=$(mktemp)
sout=$(mktemp)
cin=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 7dec65a5ed75..57a9ea9db2ec 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -141,6 +141,12 @@ check_tools()
exit $ksft_skip
fi
+ ss -h | grep -q MPTCP
+ if [ $? -ne 0 ];then
+ echo "SKIP: ss tool does not support MPTCP"
+ exit $ksft_skip
+ fi
+
# Use the legacy version if available to support old kernel versions
if iptables-legacy -V &> /dev/null; then
iptables="iptables-legacy"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index ff49ee9b9cc2..2c11cad6b607 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -85,6 +85,12 @@ if [ $? -ne 0 ];then
exit $ksft_skip
fi
+ss -h | grep -q MPTCP
+if [ $? -ne 0 ];then
+ echo "SKIP: ss tool does not support MPTCP"
+ exit $ksft_skip
+fi
+
# Use the legacy version if available to support old kernel versions
if iptables-legacy -V &> /dev/null; then
iptables="iptables-legacy"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 11/33] selftests: mptcp: add mptcp_lib_check_tools helper
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (9 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 10/33] selftests: mptcp: add ss mptcp support checks Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 12/33] selftests: mptcp: diag: print colored output Geliang Tang
` (21 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch exports check_tools() helper from mptcp_join.sh into
mptcp_lib.sh as a public one mptcp_lib_check_tools(). The arguments
"ip", "ss", and "iptables" are passed into this helper to indicate
whether to check ip tool, ss tool and iptables tools.
This helper can be used in every scripts.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 13 +-----
.../selftests/net/mptcp/mptcp_connect.sh | 15 +------
.../testing/selftests/net/mptcp/mptcp_join.sh | 33 +--------------
.../testing/selftests/net/mptcp/mptcp_lib.sh | 40 +++++++++++++++++++
.../selftests/net/mptcp/mptcp_sockopt.sh | 29 +-------------
.../testing/selftests/net/mptcp/pm_netlink.sh | 8 +---
.../selftests/net/mptcp/simult_flows.sh | 8 +---
.../selftests/net/mptcp/userspace_pm.sh | 8 +---
8 files changed, 47 insertions(+), 107 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 3119811018fc..1c86183864d3 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -31,18 +31,7 @@ cleanup()
mptcp_lib_cleanup
}
-mptcp_lib_check_mptcp
-
-ip -Version > /dev/null 2>&1
-if [ $? -ne 0 ];then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
-fi
-ss -h | grep -q MPTCP
-if [ $? -ne 0 ];then
- echo "SKIP: ss tool does not support MPTCP"
- exit $ksft_skip
-fi
+mptcp_lib_check_tools "ip" "ss"
get_msk_inuse()
{
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index b554c2e9750e..cf9548e190b1 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -136,20 +136,7 @@ cleanup()
mptcp_lib_cleanup
}
-mptcp_lib_check_mptcp
-mptcp_lib_check_kallsyms
-
-ip -Version > /dev/null 2>&1
-if [ $? -ne 0 ];then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
-fi
-
-ss -h | grep -q MPTCP
-if [ $? -ne 0 ];then
- echo "SKIP: ss tool does not support MPTCP"
- exit $ksft_skip
-fi
+mptcp_lib_check_tools "ip" "ss"
sin=$(mktemp)
sout=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 57a9ea9db2ec..b5d149008d21 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -22,8 +22,6 @@ tmpfile=""
cout=""
capout=""
ksft_skip=4
-iptables="iptables"
-ip6tables="ip6tables"
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
capture=0
@@ -131,39 +129,10 @@ cleanup_partial()
mptcp_lib_ns_exit
}
-check_tools()
-{
- mptcp_lib_check_mptcp
- mptcp_lib_check_kallsyms
-
- if ! ip -Version &> /dev/null; then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
- fi
-
- ss -h | grep -q MPTCP
- if [ $? -ne 0 ];then
- echo "SKIP: ss tool does not support MPTCP"
- exit $ksft_skip
- fi
-
- # Use the legacy version if available to support old kernel versions
- if iptables-legacy -V &> /dev/null; then
- iptables="iptables-legacy"
- ip6tables="ip6tables-legacy"
- elif ! iptables -V &> /dev/null; then
- echo "SKIP: Could not run all tests without iptables tool"
- exit $ksft_skip
- elif ! ip6tables -V &> /dev/null; then
- echo "SKIP: Could not run all tests without ip6tables tool"
- exit $ksft_skip
- fi
-}
-
init() {
init=1
- check_tools
+ mptcp_lib_check_tools "ip" "ss" "iptables"
sin=$(mktemp)
sout=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index e8e1250e5ea6..491730cf24dc 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -514,6 +514,46 @@ mptcp_lib_ns_exit() {
done
}
+iptables="iptables"
+ip6tables="ip6tables"
+
+mptcp_lib_check_tools() {
+ : "${iptables:?}"
+ : "${ip6tables:?}"
+
+ mptcp_lib_check_mptcp
+ mptcp_lib_check_kallsyms
+
+ if [ "${1:-""}" == "ip" ]; then
+ if ! ip -Version &> /dev/null; then
+ mptcp_lib_print_warn "SKIP: Could not run test without ip tool"
+ exit $ksft_skip
+ fi
+ fi
+
+ if [ "${2:-""}" == "ss" ]; then
+ ss -h | grep -q MPTCP
+ if [ $? -ne 0 ];then
+ mptcp_lib_print_warn "SKIP: ss tool does not support MPTCP"
+ exit $ksft_skip
+ fi
+ fi
+
+ if [ "${3:-""}" == "iptables" ]; then
+ # Use the legacy version if available to support old kernel versions
+ if iptables-legacy -V &> /dev/null; then
+ iptables="iptables-legacy"
+ ip6tables="ip6tables-legacy"
+ elif ! iptables -V &> /dev/null; then
+ mptcp_lib_print_warn "SKIP: Could not run all tests without iptables tool"
+ exit $ksft_skip
+ elif ! ip6tables -V &> /dev/null; then
+ mptcp_lib_print_warn "SKIP: Could not run all tests without ip6tables tool"
+ exit $ksft_skip
+ fi
+ fi
+}
+
mptcp_lib_cleanup() {
: "${check_output_err:?}"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 2c11cad6b607..2290b3290214 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -10,8 +10,6 @@ cout=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-iptables="iptables"
-ip6tables="ip6tables"
mptcp_lib_ns_init
@@ -76,32 +74,7 @@ cleanup()
mptcp_lib_cleanup
}
-mptcp_lib_check_mptcp
-mptcp_lib_check_kallsyms
-
-ip -Version > /dev/null 2>&1
-if [ $? -ne 0 ];then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
-fi
-
-ss -h | grep -q MPTCP
-if [ $? -ne 0 ];then
- echo "SKIP: ss tool does not support MPTCP"
- exit $ksft_skip
-fi
-
-# Use the legacy version if available to support old kernel versions
-if iptables-legacy -V &> /dev/null; then
- iptables="iptables-legacy"
- ip6tables="ip6tables-legacy"
-elif ! iptables -V &> /dev/null; then
- echo "SKIP: Could not run all tests without iptables tool"
- exit $ksft_skip
-elif ! ip6tables -V &> /dev/null; then
- echo "SKIP: Could not run all tests without ip6tables tool"
- exit $ksft_skip
-fi
+mptcp_lib_check_tools "ip" "ss" "iptables"
check_mark()
{
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index 8f99b138a59f..e8ecf292a38f 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -31,13 +31,7 @@ cleanup()
mptcp_lib_cleanup
}
-mptcp_lib_check_mptcp
-
-ip -Version > /dev/null 2>&1
-if [ $? -ne 0 ];then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
-fi
+mptcp_lib_check_tools "ip"
trap cleanup EXIT
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index c1a21cd8c076..57180c2da605 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -29,13 +29,7 @@ cleanup()
mptcp_lib_cleanup
}
-mptcp_lib_check_mptcp
-
-ip -Version > /dev/null 2>&1
-if [ $? -ne 0 ];then
- echo "SKIP: Could not run test without ip tool"
- exit $ksft_skip
-fi
+mptcp_lib_check_tools "ip"
# "$ns1" ns2 ns3
# ns1eth1 ns2eth1 ns2eth3 ns3eth1
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 93f8b200ce49..50eda314ec2e 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -10,19 +10,13 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-mptcp_lib_check_mptcp
-mptcp_lib_check_kallsyms
+mptcp_lib_check_tools "ip"
if ! mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
echo "userspace pm tests are not supported by the kernel: SKIP"
exit ${KSFT_SKIP}
fi
-if ! ip -Version &> /dev/null; then
- echo "SKIP: Cannot not run test without ip tool"
- exit ${KSFT_SKIP}
-fi
-
file=""
client4_pid=0
server4_pid=0
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 12/33] selftests: mptcp: diag: print colored output
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (10 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 11/33] selftests: mptcp: add mptcp_lib_check_tools helper Geliang Tang
@ 2023-12-05 7:00 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 13/33] selftests: mptcp: connect: " Geliang Tang
` (20 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:00 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use mptcp_lib_print_ok(), _warn(), and _err() helpers in script diag.sh
to print test results with colors.
Having colors helps to quickly identify issues when looking at a long
list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 1c86183864d3..79f77998d7c4 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -51,15 +51,15 @@ __chk_nr()
printf "%-50s" "$msg"
if [ $nr != $expected ]; then
if [ $nr = "$skip" ] && ! mptcp_lib_expect_all_features; then
- echo "[ SKIP ] Feature probably not supported"
+ mptcp_lib_print_warn "[ SKIP ] Feature probably not supported"
mptcp_lib_result_skip "${msg}"
else
- echo "[ FAIL ] expected $expected found $nr"
+ mptcp_lib_print_err "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg}"
ret=$test_cnt
fi
else
- echo "[ OK ]"
+ mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
test_cnt=$((test_cnt+1))
@@ -100,15 +100,15 @@ wait_msk_nr()
printf "%-50s" "$msg"
if [ $i -ge $timeout ]; then
- echo "[ FAIL ] timeout while expecting $expected max $max last $nr"
+ mptcp_lib_print_err "[ FAIL ] timeout while expecting $expected max $max last $nr"
mptcp_lib_result_fail "${msg} # timeout"
ret=$test_cnt
elif [ $nr != $expected ]; then
- echo "[ FAIL ] expected $expected found $nr"
+ mptcp_lib_print_err "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg} # unexpected result"
ret=$test_cnt
else
- echo "[ OK ]"
+ mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
test_cnt=$((test_cnt+1))
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 13/33] selftests: mptcp: connect: print colored output
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (11 preceding siblings ...)
2023-12-05 7:00 ` [PATCH mptcp-next v5 12/33] selftests: mptcp: diag: print colored output Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 14/33] selftests: mptcp: sockopt: print every test result Geliang Tang
` (19 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use mptcp_lib_print_info() and _ok() helpers in script mptcp_connect.sh
to print test results with colors.
Having colors helps to quickly identify issues when looking at a long
list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../selftests/net/mptcp/mptcp_connect.sh | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index cf9548e190b1..e566b57d5cc1 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -242,7 +242,8 @@ check_mptcp_disabled()
# net.mptcp.enabled should be enabled by default
if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ print $3 }')" -ne 1 ]; then
- echo -e "net.mptcp.enabled sysctl is not 1 by default\t\t[ FAIL ]"
+ echo -n -e "net.mptcp.enabled sysctl is not 1 by default\t\t"
+ mptcp_lib_print_err "\t\t [ FAIL ]"
mptcp_lib_result_fail "net.mptcp.enabled sysctl is not 1 by default"
ret=1
return 1
@@ -255,13 +256,15 @@ check_mptcp_disabled()
ip netns delete ${disabled_ns}
if [ ${err} -eq 0 ]; then
- echo -e "New MPTCP socket cannot be blocked via sysctl\t\t[ FAIL ]"
+ echo -n -e "New MPTCP socket cannot be blocked via sysctl\t\t"
+ mptcp_lib_print_err "\t\t [ FAIL ]"
mptcp_lib_result_fail "New MPTCP socket cannot be blocked via sysctl"
ret=1
return 1
fi
- echo -e "New MPTCP socket can be blocked via sysctl\t\t[ OK ]"
+ echo -n -e "New MPTCP socket can be blocked via sysctl\t\t"
+ mptcp_lib_print_ok "\t\t [ OK ]"
mptcp_lib_result_pass "New MPTCP socket can be blocked via sysctl"
return 0
}
@@ -477,7 +480,7 @@ do_transfer()
fi
if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then
- printf "[ OK ]"
+ mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}"
else
mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}"
@@ -508,7 +511,6 @@ do_transfer()
"${expect_ackrx}" "${stat_ackrx_now_l}"
fi
- echo
cat "$capout"
[ $retc -eq 0 ] && [ $rets -eq 0 ]
}
@@ -684,7 +686,7 @@ EOF
return
fi
- echo "INFO: test $msg"
+ mptcp_lib_print_info "INFO: test $msg"
TEST_COUNT=10000
local extra_args="-o TRANSPARENT"
@@ -711,7 +713,7 @@ run_tests_peekmode()
local peekmode="$1"
TEST_GROUP="peek mode: ${peekmode}"
- echo "INFO: with peek mode: ${peekmode}"
+ mptcp_lib_print_info "INFO: with peek mode: ${peekmode}"
run_tests_lo "$ns1" "$ns1" 10.0.1.1 1 "-P ${peekmode}"
run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-P ${peekmode}"
}
@@ -726,7 +728,7 @@ run_tests_mptfo()
return
fi
- echo "INFO: with MPTFO start"
+ mptcp_lib_print_info "INFO: with MPTFO start"
ip netns exec "$ns1" sysctl -q net.ipv4.tcp_fastopen=2
ip netns exec "$ns2" sysctl -q net.ipv4.tcp_fastopen=1
@@ -738,7 +740,7 @@ run_tests_mptfo()
ip netns exec "$ns1" sysctl -q net.ipv4.tcp_fastopen=0
ip netns exec "$ns2" sysctl -q net.ipv4.tcp_fastopen=0
- echo "INFO: with MPTFO end"
+ mptcp_lib_print_info "INFO: with MPTFO end"
}
run_tests_disconnect()
@@ -762,7 +764,7 @@ run_tests_disconnect()
cin_disconnect="$old_cin"
connect_per_transfer=3
- echo "INFO: disconnect"
+ mptcp_lib_print_info "INFO: disconnect"
run_tests_lo "$ns1" "$ns1" 10.0.1.1 1 "-I 3 -i $old_cin"
run_tests_lo "$ns1" "$ns1" dead:beef:1::1 1 "-I 3 -i $old_cin"
@@ -811,7 +813,7 @@ check_mptcp_disabled
stop_if_error "The kernel configuration is not valid for MPTCP"
-echo "INFO: validating network environment with pings"
+mptcp_lib_print_info "INFO: validating network environment with pings"
for sender in "$ns1" "$ns2" "$ns3" "$ns4";do
do_ping "$ns1" $sender 10.0.1.1
do_ping "$ns1" $sender dead:beef:1::1
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 14/33] selftests: mptcp: sockopt: print every test result
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (12 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 13/33] selftests: mptcp: connect: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 15/33] selftests: mptcp: sockopt: print colored output Geliang Tang
` (18 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Only total test results are printed out in mptcp_sockopt.sh:
PASS: all packets had packet mark set
PASS: SOL_MPTCP getsockopt has expected information
PASS: TCP_INQ cmsg/ioctl -t tcp
PASS: TCP_INQ cmsg/ioctl -6 -t tcp
PASS: TCP_INQ cmsg/ioctl -r tcp
PASS: TCP_INQ cmsg/ioctl -6 -r tcp
This patch prints more info for every test result in each test
group:
transfer ipv4 [ OK ]
mark ipv4 [ OK ]
transfer ipv6 [ OK ]
mark ipv6 [ OK ]
PASS: all packets had packet mark set
sockopt v4 [ OK ]
sockopt v6 [ OK ]
PASS: SOL_MPTCP getsockopt has expected information
TCP_INQ: -t tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -t tcp
TCP_INQ: -6 -t tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -6 -t tcp
TCP_INQ: -r tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -r tcp
TCP_INQ: -6 -r tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -6 -r tcp
TCP_INQ: -r tcp -t tcp [ OK ]
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 2290b3290214..8cee8bc6d6e5 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -152,6 +152,7 @@ do_transfer()
wait $spid
local rets=$?
+ printf "%-25s %35s" "transfer ${ip}" " "
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
echo " client exit code $retc, server $rets" 1>&2
echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
@@ -160,12 +161,15 @@ do_transfer()
echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
ip netns exec ${connector_ns} ss -Menita 1>&2 -o "dport = :$port"
+ mptcp_lib_print_err "[ FAIL ]"
mptcp_lib_result_fail "transfer ${ip}"
ret=1
return 1
fi
+ mptcp_lib_print_ok "[ OK ]"
+ printf "%-25s %35s" "mark ${ip}" " "
if [ $local_addr = "::" ];then
check_mark $listener_ns 6 || retc=1
check_mark $connector_ns 6 || retc=1
@@ -181,8 +185,10 @@ do_transfer()
mptcp_lib_result_code "${rets}" "transfer ${ip}"
if [ $retc -eq 0 ] && [ $rets -eq 0 ];then
+ mptcp_lib_print_ok "[ OK ]"
return 0
fi
+ mptcp_lib_print_err "[ FAIL ]"
return 1
}
@@ -211,23 +217,27 @@ do_mptcp_sockopt_tests()
ip netns exec "$ns3" ./mptcp_sockopt
lret=$?
+ printf "%-25s %35s" "sockopt v4" " "
if [ $lret -ne 0 ]; then
echo "FAIL: SOL_MPTCP getsockopt" 1>&2
mptcp_lib_result_fail "sockopt v4"
ret=$lret
return
fi
+ mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "sockopt v4"
ip netns exec "$ns3" ./mptcp_sockopt -6
lret=$?
+ printf "%-25s %35s" "sockopt v6" " "
if [ $lret -ne 0 ]; then
echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2
mptcp_lib_result_fail "sockopt v6"
ret=$lret
return
fi
+ mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "sockopt v6"
}
@@ -250,6 +260,7 @@ run_tests()
do_tcpinq_test()
{
+ printf "%-25s %35s" "TCP_INQ: $*" " "
ip netns exec "$ns3" ./mptcp_inq "$@"
local lret=$?
if [ $lret -ne 0 ];then
@@ -258,6 +269,7 @@ do_tcpinq_test()
mptcp_lib_result_fail "TCP_INQ: $*"
return $lret
fi
+ mptcp_lib_print_ok "[ OK ]"
echo "PASS: TCP_INQ cmsg/ioctl $@"
mptcp_lib_result_pass "TCP_INQ: $*"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 15/33] selftests: mptcp: sockopt: print colored output
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (13 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 14/33] selftests: mptcp: sockopt: print every test result Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 16/33] selftests: mptcp: simult flows: " Geliang Tang
` (17 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use mptcp_lib_print_info(), _warn() and _err() helpers in script
mptcp_sockopt.sh to print test results with colors.
Having colors helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_sockopt.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 8cee8bc6d6e5..338d48c248c4 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -209,7 +209,7 @@ do_mptcp_sockopt_tests()
local lret=0
if ! mptcp_lib_kallsyms_has "mptcp_diag_fill_info$"; then
- echo "INFO: MPTCP sockopt not supported: SKIP"
+ mptcp_lib_print_warn "INFO: MPTCP sockopt not supported: SKIP"
mptcp_lib_result_skip "sockopt"
return
fi
@@ -219,7 +219,7 @@ do_mptcp_sockopt_tests()
printf "%-25s %35s" "sockopt v4" " "
if [ $lret -ne 0 ]; then
- echo "FAIL: SOL_MPTCP getsockopt" 1>&2
+ mptcp_lib_print_err "[ FAIL ] SOL_MPTCP getsockopt"
mptcp_lib_result_fail "sockopt v4"
ret=$lret
return
@@ -232,7 +232,7 @@ do_mptcp_sockopt_tests()
printf "%-25s %35s" "sockopt v6" " "
if [ $lret -ne 0 ]; then
- echo "FAIL: SOL_MPTCP getsockopt (ipv6)" 1>&2
+ mptcp_lib_print_err "[ FAIL] SOL_MPTCP getsockopt (ipv6)"
mptcp_lib_result_fail "sockopt v6"
ret=$lret
return
@@ -265,13 +265,13 @@ do_tcpinq_test()
local lret=$?
if [ $lret -ne 0 ];then
ret=$lret
- echo "FAIL: mptcp_inq $@" 1>&2
+ mptcp_lib_print_err "[ FAIL ] mptcp_inq $@"
mptcp_lib_result_fail "TCP_INQ: $*"
return $lret
fi
mptcp_lib_print_ok "[ OK ]"
- echo "PASS: TCP_INQ cmsg/ioctl $@"
+ mptcp_lib_print_info "PASS: TCP_INQ cmsg/ioctl $@"
mptcp_lib_result_pass "TCP_INQ: $*"
return $lret
}
@@ -281,7 +281,7 @@ do_tcpinq_tests()
local lret=0
if ! mptcp_lib_kallsyms_has "mptcp_ioctl$"; then
- echo "INFO: TCP_INQ not supported: SKIP"
+ mptcp_lib_print_warn "INFO: TCP_INQ not supported: SKIP"
mptcp_lib_result_skip "TCP_INQ"
return
fi
@@ -318,12 +318,12 @@ run_tests $ns1 $ns2 10.0.1.1
run_tests $ns1 $ns2 dead:beef:1::1
if [ $ret -eq 0 ];then
- echo "PASS: all packets had packet mark set"
+ mptcp_lib_print_info "PASS: all packets had packet mark set"
fi
do_mptcp_sockopt_tests
if [ $ret -eq 0 ];then
- echo "PASS: SOL_MPTCP getsockopt has expected information"
+ mptcp_lib_print_info "PASS: SOL_MPTCP getsockopt has expected information"
fi
do_tcpinq_tests
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 16/33] selftests: mptcp: simult flows: print colored output
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (14 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 15/33] selftests: mptcp: sockopt: print colored output Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 17/33] selftests: mptcp: connect: add PORT instead of TEST_COUNT Geliang Tang
` (16 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use mptcp_lib_print_ok() and _err() helpers in script simult_flows.sh
to print test results with colors.
Having colors helps to quickly identify issues when looking at a long
list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
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 57180c2da605..c077e05e1319 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -169,12 +169,12 @@ do_transfer()
printf "%-16s" " max $max_time "
if [ $retc -eq 0 ] && [ $rets -eq 0 ] && \
[ $cmpc -eq 0 ] && [ $cmps -eq 0 ]; then
- echo "[ OK ]"
+ mptcp_lib_print_ok "[ OK ]"
cat "$capout"
return 0
fi
- echo " [ FAIL ]"
+ mptcp_lib_print_err " [ FAIL ]"
echo "client exit code $retc, server $rets" 1>&2
echo -e "\nnetns ${ns3} socket stat for $port:" 1>&2
ip netns exec ${ns3} ss -nita 1>&2 -o "sport = :$port"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 17/33] selftests: mptcp: connect: add PORT instead of TEST_COUNT
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (15 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 16/33] selftests: mptcp: simult flows: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 18/33] selftests: mptcp: connect: print out test counter Geliang Tang
` (15 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch adds a new counter 'PORT' instead of TEST_COUNT to increase
port numbers in mptcp_connect.sh.
This can avoid outputting discontinuous test counters.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index e566b57d5cc1..8e28e9859415 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -28,6 +28,7 @@ do_tcp=0
checksum=false
filesize=0
connect_per_transfer=1
+PORT=0
if [ $tc_loss -eq 100 ];then
tc_loss=1%
@@ -305,8 +306,9 @@ do_transfer()
local extra_args="$7"
local port
- port=$((10000+$TEST_COUNT))
+ port=$((10000+$PORT))
TEST_COUNT=$((TEST_COUNT+1))
+ PORT=$((PORT+1))
if [ "$rcvbuf" -gt 0 ]; then
extra_args="$extra_args -R $rcvbuf"
@@ -688,7 +690,7 @@ EOF
mptcp_lib_print_info "INFO: test $msg"
- TEST_COUNT=10000
+ PORT=10000
local extra_args="-o TRANSPARENT"
do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP \
${connect_addr} ${local_addr} "${extra_args}"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 18/33] selftests: mptcp: connect: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (16 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 17/33] selftests: mptcp: connect: add PORT instead of TEST_COUNT Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 19/33] selftests: mptcp: rename test_cnt to TEST_COUNT Geliang Tang
` (14 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in mptcp_connect.sh.
The output looks like:
01 New MPTCP socket can be blocked via sysctl [ OK ]
INFO: validating network environment with pings
02 ping tests [ OK ]
INFO: Using loss of 0.16% delay 25 ms reorder .. with delay 6ms on ns3eth4
03 ns1 MPTCP -> ns1 (10.0.1.1:10000 ) MPTCP (duration 116ms) [ OK ]
04 ns1 MPTCP -> ns1 (10.0.1.1:10001 ) TCP (duration 33ms) [ OK ]
05 ns1 TCP -> ns1 (10.0.1.1:10002 ) MPTCP (duration 25ms) [ OK ]
06 ns1 MPTCP -> ns1 (dead:beef:1::1:10003) MPTCP (duration 128ms) [ OK ]
07 ns1 MPTCP -> ns1 (dead:beef:1::1:10004) TCP (duration 31ms) [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../selftests/net/mptcp/mptcp_connect.sh | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 8e28e9859415..011980ec6b6f 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -264,7 +264,7 @@ check_mptcp_disabled()
return 1
fi
- echo -n -e "New MPTCP socket can be blocked via sysctl\t\t"
+ echo -n -e "0${TEST_COUNT} New MPTCP socket can be blocked via sysctl\t\t"
mptcp_lib_print_ok "\t\t [ OK ]"
mptcp_lib_result_pass "New MPTCP socket can be blocked via sysctl"
return 0
@@ -334,7 +334,8 @@ do_transfer()
local addr_port
addr_port=$(printf "%s:%d" ${connect_addr} ${port})
local result_msg
- result_msg="$(printf "%.3s %-5s -> %.3s (%-20s) %-5s" ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${srv_proto})"
+ result_msg="$(printf "%02u %.3s %-5s -> %.3s (%-20s) %-5s" \
+ ${TEST_COUNT} ${connector_ns} ${cl_proto} ${listener_ns} ${addr_port} ${srv_proto})"
printf "%s\t" "${result_msg}"
if $capture; then
@@ -638,7 +639,8 @@ run_test_transparent()
# following function has been exported (T). Not great but better than
# checking for a specific kernel version.
if ! mptcp_lib_kallsyms_has "T __ip_sock_set_tos$"; then
- echo "INFO: ${msg} not supported by the kernel: SKIP"
+ TEST_COUNT=$((TEST_COUNT+1))
+ echo "${TEST_COUNT} INFO: ${msg} not supported by the kernel: SKIP"
mptcp_lib_result_skip "${TEST_GROUP}"
return
fi
@@ -655,7 +657,8 @@ table inet mangle {
}
EOF
if [ $? -ne 0 ]; then
- echo "SKIP: $msg, could not load nft ruleset"
+ TEST_COUNT=$((TEST_COUNT+1))
+ echo "${TEST_COUNT} SKIP: $msg, could not load nft ruleset"
mptcp_lib_fail_if_expected_feature "nft rules"
mptcp_lib_result_skip "${TEST_GROUP}"
return
@@ -671,8 +674,9 @@ EOF
ip -net "$listener_ns" $r6flag rule add fwmark 1 lookup 100
if [ $? -ne 0 ]; then
+ TEST_COUNT=$((TEST_COUNT+1))
ip netns exec "$listener_ns" nft flush ruleset
- echo "SKIP: $msg, ip $r6flag rule failed"
+ echo "${TEST_COUNT} SKIP: $msg, ip $r6flag rule failed"
mptcp_lib_fail_if_expected_feature "ip rule"
mptcp_lib_result_skip "${TEST_GROUP}"
return
@@ -680,9 +684,10 @@ EOF
ip -net "$listener_ns" route add local $local_addr/0 dev lo table 100
if [ $? -ne 0 ]; then
+ TEST_COUNT=$((TEST_COUNT+1))
ip netns exec "$listener_ns" nft flush ruleset
ip -net "$listener_ns" $r6flag rule del fwmark 1 lookup 100
- echo "SKIP: $msg, ip route add local $local_addr failed"
+ echo "${TEST_COUNT} SKIP: $msg, ip route add local $local_addr failed"
mptcp_lib_fail_if_expected_feature "ip route"
mptcp_lib_result_skip "${TEST_GROUP}"
return
@@ -811,10 +816,12 @@ stop_if_error()
make_file "$cin" "client"
make_file "$sin" "server"
+TEST_COUNT=$((TEST_COUNT+1))
check_mptcp_disabled
stop_if_error "The kernel configuration is not valid for MPTCP"
+TEST_COUNT=$((TEST_COUNT+1))
mptcp_lib_print_info "INFO: validating network environment with pings"
for sender in "$ns1" "$ns2" "$ns3" "$ns4";do
do_ping "$ns1" $sender 10.0.1.1
@@ -838,6 +845,9 @@ mptcp_lib_result_code "${ret}" "ping tests"
stop_if_error "Could not even run ping tests"
+echo -n -e "0${TEST_COUNT} ping tests\t\t"
+mptcp_lib_print_ok "\t\t\t\t\t\t [ OK ]"
+
[ -n "$tc_loss" ] && tc -net "$ns2" qdisc add dev ns2eth3 root netem loss random $tc_loss delay ${tc_delay}ms
echo -n "INFO: Using loss of $tc_loss "
test "$tc_delay" -gt 0 && echo -n "delay $tc_delay ms "
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 19/33] selftests: mptcp: rename test_cnt to TEST_COUNT
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (17 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 18/33] selftests: mptcp: connect: print out test counter Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 20/33] selftests: mptcp: diag: print out test counter Geliang Tang
` (13 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Most scripts use variable TEST_COUNT, but test_cnt are used in diag.sh
and simult_flows.sh. To maintain consistency with other scripts, this
patch renames them as TEST_COUNT:
test_cnt -> TEST_COUNT in diag.sh, simult_flows.sh
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 12 ++++++------
tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 79f77998d7c4..47a37d379c9a 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,7 +5,7 @@
mptcp_lib_ns_init
ksft_skip=4
-test_cnt=1
+TEST_COUNT=1
timeout_poll=100
timeout_test=$((timeout_poll * 2 + 1))
@@ -56,13 +56,13 @@ __chk_nr()
else
mptcp_lib_print_err "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg}"
- ret=$test_cnt
+ ret=$TEST_COUNT
fi
else
mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
- test_cnt=$((test_cnt+1))
+ TEST_COUNT=$((TEST_COUNT+1))
}
__chk_msk_nr()
@@ -102,16 +102,16 @@ wait_msk_nr()
if [ $i -ge $timeout ]; then
mptcp_lib_print_err "[ FAIL ] timeout while expecting $expected max $max last $nr"
mptcp_lib_result_fail "${msg} # timeout"
- ret=$test_cnt
+ ret=$TEST_COUNT
elif [ $nr != $expected ]; then
mptcp_lib_print_err "[ FAIL ] expected $expected found $nr"
mptcp_lib_result_fail "${msg} # unexpected result"
- ret=$test_cnt
+ ret=$TEST_COUNT
else
mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "${msg}"
fi
- test_cnt=$((test_cnt+1))
+ TEST_COUNT=$((TEST_COUNT+1))
}
chk_msk_fallback_nr()
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index c077e05e1319..b2b31bb49543 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -8,7 +8,7 @@ capture=false
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-test_cnt=1
+TEST_COUNT=1
bail=0
slack=50
@@ -109,8 +109,8 @@ do_transfer()
local sin=$2
local max_time=$3
local port
- port=$((10000+$test_cnt))
- test_cnt=$((test_cnt+1))
+ port=$((10000+$TEST_COUNT))
+ TEST_COUNT=$((TEST_COUNT+1))
:> "$cout"
:> "$sout"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 20/33] selftests: mptcp: diag: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (18 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 19/33] selftests: mptcp: rename test_cnt to TEST_COUNT Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 21/33] selftests: mptcp: simult flows: " Geliang Tang
` (12 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in script diag.sh.
The output looks like:
01 no msk on netns creation [ OK ]
02 listen match for dport 10000 [ OK ]
03 listen match for sport 10000 [ OK ]
04 listen match for saddr and sport [ OK ]
05 all listen sockets [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 47a37d379c9a..d1ea35e590f3 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,7 +5,7 @@
mptcp_lib_ns_init
ksft_skip=4
-TEST_COUNT=1
+TEST_COUNT=0
timeout_poll=100
timeout_test=$((timeout_poll * 2 + 1))
@@ -48,7 +48,7 @@ __chk_nr()
nr=$(eval $command)
- printf "%-50s" "$msg"
+ printf "%02u %-50s" "$((TEST_COUNT+1))" "$msg"
if [ $nr != $expected ]; then
if [ $nr = "$skip" ] && ! mptcp_lib_expect_all_features; then
mptcp_lib_print_warn "[ SKIP ] Feature probably not supported"
@@ -98,7 +98,7 @@ wait_msk_nr()
sleep 1
done
- printf "%-50s" "$msg"
+ printf "%02u %-50s" "$((TEST_COUNT+1))" "$msg"
if [ $i -ge $timeout ]; then
mptcp_lib_print_err "[ FAIL ] timeout while expecting $expected max $max last $nr"
mptcp_lib_result_fail "${msg} # timeout"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 21/33] selftests: mptcp: simult flows: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (19 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 20/33] selftests: mptcp: diag: print out test counter Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 22/33] selftests: mptcp: sockopt: " Geliang Tang
` (11 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in script simult_flows.sh.
The output looks like:
01 balanced bwidth 7411 max 8456 [ OK ]
02 balanced bwidth - reverse direction 7380 max 8456 [ OK ]
03 balanced bwidth with unbalanced delay 7434 max 8456 [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index b2b31bb49543..8fa40bc0b37c 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -8,7 +8,7 @@ capture=false
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-TEST_COUNT=1
+TEST_COUNT=0
bail=0
slack=50
@@ -221,7 +221,7 @@ run_test()
# completion (see mptcp_connect): 200ms on each side, add some slack
time=$((time + 400 + slack))
- printf "%-60s" "$msg"
+ printf "%02u %-60s" "$((TEST_COUNT+1))" "$msg"
do_transfer $small $large $time
lret=$?
mptcp_lib_result_code "${lret}" "${msg}"
@@ -230,7 +230,7 @@ run_test()
[ $bail -eq 0 ] || exit $ret
fi
- printf "%-60s" "$msg - reverse direction"
+ printf "%02u %-60s" "$((TEST_COUNT+1))" "$msg - reverse direction"
do_transfer $large $small $time
lret=$?
mptcp_lib_result_code "${lret}" "${msg}"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 22/33] selftests: mptcp: sockopt: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (20 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 21/33] selftests: mptcp: simult flows: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 23/33] selftests: mptcp: netlink: " Geliang Tang
` (10 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in script
mptcp_sockopt.sh.
The output looks like:
01 transfer ipv4 [ OK ]
02 mark ipv4 [ OK ]
03 transfer ipv6 [ OK ]
04 mark ipv6 [ OK ]
PASS: all packets had packet mark set
05 sockopt v4 [ OK ]
06 sockopt v6 [ OK ]
PASS: SOL_MPTCP getsockopt has expected information
07 TCP_INQ: -t tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -t tcp
08 TCP_INQ: -6 -t tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -6 -t tcp
09 TCP_INQ: -r tcp [ OK ]
PASS: TCP_INQ cmsg/ioctl -r tcp
10 TCP_INQ: -6 -r tcp [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_sockopt.sh | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 338d48c248c4..de051a49745b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -152,7 +152,8 @@ do_transfer()
wait $spid
local rets=$?
- printf "%-25s %35s" "transfer ${ip}" " "
+ TEST_COUNT=$((TEST_COUNT+1))
+ printf "%02u %-25s %35s" "$TEST_COUNT" "transfer ${ip}" " "
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
echo " client exit code $retc, server $rets" 1>&2
echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
@@ -169,7 +170,8 @@ do_transfer()
fi
mptcp_lib_print_ok "[ OK ]"
- printf "%-25s %35s" "mark ${ip}" " "
+ TEST_COUNT=$((TEST_COUNT+1))
+ printf "%02u %-25s %35s" "$TEST_COUNT" "mark ${ip}" " "
if [ $local_addr = "::" ];then
check_mark $listener_ns 6 || retc=1
check_mark $connector_ns 6 || retc=1
@@ -214,10 +216,11 @@ do_mptcp_sockopt_tests()
return
fi
+ TEST_COUNT=$((TEST_COUNT+1))
ip netns exec "$ns3" ./mptcp_sockopt
lret=$?
- printf "%-25s %35s" "sockopt v4" " "
+ printf "%02u %-25s %35s" "$TEST_COUNT" "sockopt v4" " "
if [ $lret -ne 0 ]; then
mptcp_lib_print_err "[ FAIL ] SOL_MPTCP getsockopt"
mptcp_lib_result_fail "sockopt v4"
@@ -227,10 +230,11 @@ do_mptcp_sockopt_tests()
mptcp_lib_print_ok "[ OK ]"
mptcp_lib_result_pass "sockopt v4"
+ TEST_COUNT=$((TEST_COUNT+1))
ip netns exec "$ns3" ./mptcp_sockopt -6
lret=$?
- printf "%-25s %35s" "sockopt v6" " "
+ printf "%02u %-25s %35s" "$TEST_COUNT" "sockopt v6" " "
if [ $lret -ne 0 ]; then
mptcp_lib_print_err "[ FAIL] SOL_MPTCP getsockopt (ipv6)"
mptcp_lib_result_fail "sockopt v6"
@@ -260,7 +264,9 @@ run_tests()
do_tcpinq_test()
{
- printf "%-25s %35s" "TCP_INQ: $*" " "
+ TEST_COUNT=$((TEST_COUNT+1))
+
+ printf "%02u %-25s %35s" "$TEST_COUNT" "TCP_INQ: $*" " "
ip netns exec "$ns3" ./mptcp_inq "$@"
local lret=$?
if [ $lret -ne 0 ];then
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 23/33] selftests: mptcp: netlink: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (21 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 22/33] selftests: mptcp: sockopt: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 24/33] selftests: mptcp: userspace: " Geliang Tang
` (9 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in script pm_netlink.sh.
The output looks like:
1 defaults addr list [ OK ]
2 simple add/get addr [ OK ]
3 dump addrs [ OK ]
4 simple del addr [ OK ]
5 dump addrs after del [ OK ]
6 duplicate addr [ OK ]
7 id addr increment [ OK ]
8 hard addr limit [ OK ]
9 above hard addr limit [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/pm_netlink.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index e8ecf292a38f..714f69de6fda 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -39,6 +39,9 @@ ip netns exec $ns1 sysctl -q net.mptcp.enabled=1
check()
{
+ TEST_COUNT=$((TEST_COUNT+1))
+
+ printf "%2u " "$TEST_COUNT"
# ${*} doesn't work here since there're spaces in some arguments.
mptcp_lib_check_output "${1}" "${2}" "${3}"
local rc=$?
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 24/33] selftests: mptcp: userspace: print out test counter
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (22 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 23/33] selftests: mptcp: netlink: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 25/33] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib Geliang Tang
` (8 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch prints out TEST_COUNT for every tests in script userspace_pm.sh.
The output looks like:
INFO: Init
01 Created network namespaces ns1, ns2 [ OK ]
INFO: Make connections
02 Established IPv4 MPTCP Connection ns2 => ns1 [ OK ]
03 Established IPv6 MPTCP Connection ns2 => ns1 [ OK ]
INFO: Announce tests
04 ADD_ADDR 10.0.2.2 (ns2) => ns1, invalid token [ OK ]
05 ADD_ADDR id:14 10.0.2.2 (ns2) => ns1, reuse port [ OK ]
Having test counters helps to quickly identify issues when looking at a
long list of output logs and results.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/userspace_pm.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 50eda314ec2e..66dbeaba1575 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -35,6 +35,7 @@ client_addr_id=${RANDOM:0:2}
server_addr_id=${RANDOM:0:2}
mptcp_lib_ns_init
+TEST_COUNT=0
TEST_NAME=""
_printf() {
@@ -50,8 +51,9 @@ print_title()
print_test()
{
TEST_NAME="${1}"
+ TEST_COUNT=$((TEST_COUNT+1))
- _printf "%-63s" "${TEST_NAME}"
+ _printf "%02u %-63s" "${TEST_COUNT}" "${TEST_NAME}"
}
test_pass()
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 25/33] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (23 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 24/33] selftests: mptcp: userspace: " Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 26/33] selftests: mptcp: simult flows: define missing vars Geliang Tang
` (7 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Move the variables 'TEST_NAME' and 'TEST_COUNT' into mptcp_lib.sh as
public variables.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 1 -
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 -
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++
tools/testing/selftests/net/mptcp/simult_flows.sh | 1 -
tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 --
6 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index d1ea35e590f3..4b0cc5c41188 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,7 +5,6 @@
mptcp_lib_ns_init
ksft_skip=4
-TEST_COUNT=0
timeout_poll=100
timeout_test=$((timeout_poll * 2 + 1))
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 011980ec6b6f..b0a8edace8f8 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -123,7 +123,6 @@ done
mptcp_lib_ns_init
-TEST_COUNT=0
TEST_GROUP=""
cleanup()
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b5d149008d21..57b6fb008997 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -38,8 +38,6 @@ declare -A all_tests
declare -a only_tests_ids
declare -a only_tests_names
declare -A failed_tests
-TEST_COUNT=0
-TEST_NAME=""
nr_blank=6
# These var are used only in some tests, make sure they are not already set
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 491730cf24dc..a6880e1d0593 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -20,6 +20,9 @@ MPTCP_LIB_LISTENER_CLOSED=16 #MPTCP_EVENT_LISTENER_CLOSED
readonly AF_INET=2
readonly AF_INET6=10
+TEST_COUNT=0
+TEST_NAME=""
+
MPTCP_LIB_SUBTESTS=()
# only if supported (or forced) and not disabled, see no-color.org
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 8fa40bc0b37c..ef61cec3bf37 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -8,7 +8,6 @@ capture=false
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-TEST_COUNT=0
bail=0
slack=50
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 66dbeaba1575..ec3a68233577 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -35,8 +35,6 @@ client_addr_id=${RANDOM:0:2}
server_addr_id=${RANDOM:0:2}
mptcp_lib_ns_init
-TEST_COUNT=0
-TEST_NAME=""
_printf() {
stdbuf -o0 -e0 printf "${@}"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 26/33] selftests: mptcp: simult flows: define missing vars
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (24 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 25/33] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 27/33] selftests: mptcp: export cin/cout/sin/sout vars Geliang Tang
` (6 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
The variables 'large', 'small', 'sout', 'cout', 'capout' and 'size' are
used in multiple functions, so they should be defined as global variables.
This patch redefines them at the beginning of simult_flows.sh.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/simult_flows.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index ef61cec3bf37..b82c083c934e 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -10,6 +10,12 @@ timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
bail=0
slack=50
+large=""
+small=""
+sout=""
+cout=""
+capout=""
+size=0
usage() {
echo "Usage: $0 [ -b ] [ -c ] [ -d ]"
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 27/33] selftests: mptcp: export cin/cout/sin/sout vars
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (25 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 26/33] selftests: mptcp: simult flows: define missing vars Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 28/33] selftests: mptcp: join: change capture/checksum as bool Geliang Tang
` (5 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Export cin, cout, sin and sout vars into mptcp_lib.sh as public vars.
Then they can be used in all test scripts unified.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 10 ----------
tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++----------
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 10 ++++++++++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 10 ----------
tools/testing/selftests/net/mptcp/simult_flows.sh | 5 -----
5 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index b0a8edace8f8..aeedd822490c 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -7,11 +7,7 @@ time_start=$(date +%s)
optstring="S:R:d:e:l:r:h4cm:f:tC"
final_ret=0
-sin=""
-sout=""
cin_disconnect=""
-cin=""
-cout=""
ksft_skip=4
capture=false
timeout_poll=30
@@ -128,8 +124,6 @@ TEST_GROUP=""
cleanup()
{
rm -f "$cin_disconnect" "$cout_disconnect"
- rm -f "$cin" "$cout"
- rm -f "$sin" "$sout"
rm -f "$capout"
mptcp_lib_ns_exit
@@ -138,10 +132,6 @@ cleanup()
mptcp_lib_check_tools "ip" "ss"
-sin=$(mktemp)
-sout=$(mktemp)
-cin=$(mktemp)
-cout=$(mktemp)
capout=$(mktemp)
cin_disconnect="$cin".disconnect
cout_disconnect="$cout".disconnect
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 57b6fb008997..a2f595d70a92 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -12,14 +12,10 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-sin=""
sinfail=""
-sout=""
-cin=""
cinfail=""
cinsent=""
tmpfile=""
-cout=""
capout=""
ksft_skip=4
timeout_poll=30
@@ -132,11 +128,7 @@ init() {
mptcp_lib_check_tools "ip" "ss" "iptables"
- sin=$(mktemp)
- sout=$(mktemp)
- cin=$(mktemp)
cinsent=$(mktemp)
- cout=$(mktemp)
mptcp_lib_evts_init
trap cleanup EXIT
@@ -147,8 +139,8 @@ init() {
cleanup()
{
- rm -f "$cin" "$cout" "$sinfail"
- rm -f "$sin" "$sout" "$cinsent" "$cinfail"
+ rm -f "$sinfail"
+ rm -f "$cinsent" "$cinfail"
rm -f "$tmpfile"
mptcp_lib_evts_remove
cleanup_partial
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index a6880e1d0593..56aaa5350cb2 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -25,6 +25,11 @@ TEST_NAME=""
MPTCP_LIB_SUBTESTS=()
+sin=$(mktemp)
+sout=$(mktemp)
+cin=$(mktemp)
+cout=$(mktemp)
+
# only if supported (or forced) and not disabled, see no-color.org
if { [ -t 1 ] || [ "${SELFTESTS_MPTCP_LIB_COLOR_FORCE:-}" = "1" ]; } &&
[ "${NO_COLOR:-}" != "1" ]; then
@@ -559,9 +564,14 @@ mptcp_lib_check_tools() {
mptcp_lib_cleanup() {
: "${check_output_err:?}"
+ : "${sin:?}"
+ : "${sout:?}"
+ : "${cin:?}"
+ : "${cout:?}"
echo "cleanup"
rm -f $check_output_err
+ rm -f "$sin" "$sout" "$cin" "$cout"
}
echo -e "\n${KSFT_TEST}\n"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index de051a49745b..ec829165d562 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -3,10 +3,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-sin=""
-sout=""
-cin=""
-cout=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
@@ -69,8 +65,6 @@ init()
cleanup()
{
mptcp_lib_ns_exit
- rm -f "$cin" "$cout"
- rm -f "$sin" "$sout"
mptcp_lib_cleanup
}
@@ -311,10 +305,6 @@ do_tcpinq_tests()
return $?
}
-sin=$(mktemp)
-sout=$(mktemp)
-cin=$(mktemp)
-cout=$(mktemp)
init
make_file "$cin" "client" 1
make_file "$sin" "server" 1
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index b82c083c934e..03e88b6c47d0 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -12,8 +12,6 @@ bail=0
slack=50
large=""
small=""
-sout=""
-cout=""
capout=""
size=0
@@ -26,7 +24,6 @@ usage() {
cleanup()
{
- rm -f "$cout" "$sout"
rm -f "$large" "$small"
rm -f "$capout"
@@ -46,8 +43,6 @@ setup()
{
large=$(mktemp)
small=$(mktemp)
- sout=$(mktemp)
- cout=$(mktemp)
capout=$(mktemp)
size=$((2 * 2048 * 4096))
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 28/33] selftests: mptcp: join: change capture/checksum as bool
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (26 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 27/33] selftests: mptcp: export cin/cout/sin/sout vars Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 29/33] selftests: mptcp: export capture/checksum vars Geliang Tang
` (4 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
To maintain consistency with other scripts, this patch changes vars
'capture' and 'checksum' as bool vars in mptcp_join.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index a2f595d70a92..d998c4a9cb07 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -20,11 +20,11 @@ capout=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-capture=0
-checksum=0
+capture=false
+checksum=false
ip_mptcp=0
check_invert=0
-validate_checksum=0
+validate_checksum=false
init=0
last_test_failed=0
last_test_skipped=0
@@ -76,7 +76,7 @@ init_partial()
for netns in "$ns1" "$ns2"; do
ip netns exec $netns sysctl -q net.mptcp.enabled=1
ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true
- if [ $checksum -eq 1 ]; then
+ if $checksum; then
ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1
fi
done
@@ -325,7 +325,7 @@ reset_with_checksum()
ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=$ns1_enable
ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
- validate_checksum=1
+ validate_checksum=true
}
reset_with_allow_join_id0()
@@ -358,7 +358,7 @@ reset_with_allow_join_id0()
setup_fail_rules()
{
check_invert=1
- validate_checksum=1
+ validate_checksum=true
local i="$1"
local ip="${2:-4}"
local tables
@@ -957,7 +957,7 @@ do_transfer()
:> "$sout"
:> "$capout"
- if [ $capture -eq 1 ]; then
+ if $capture; then
local capuser
if [ -z $SUDO_USER ] ; then
capuser=""
@@ -1059,7 +1059,7 @@ do_transfer()
wait $spid
local rets=$?
- if [ $capture -eq 1 ]; then
+ if $capture; then
sleep 1
kill $cappid
fi
@@ -1447,7 +1447,7 @@ chk_join_nr()
else
print_ok
fi
- if [ $validate_checksum -eq 1 ]; then
+ if $validate_checksum; then
chk_csum_nr $csum_ns1 $csum_ns2
chk_fail_nr $fail_nr $fail_nr
chk_rst_nr $rst_nr $rst_nr
@@ -3643,10 +3643,10 @@ while getopts "${all_tests_args}cCih" opt; do
tests+=("${all_tests[${opt}]}")
;;
c)
- capture=1
+ capture=true
;;
C)
- checksum=1
+ checksum=true
;;
i)
ip_mptcp=1
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 29/33] selftests: mptcp: export capture/checksum vars
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (27 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 28/33] selftests: mptcp: join: change capture/checksum as bool Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 30/33] selftests: mptcp: diag: change timeout_poll to 30 Geliang Tang
` (3 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
The variables 'capture' and 'checksum' are defined in multiple scripts.
So this patch moves them into mptcp_lib.sh as public variables.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++
tools/testing/selftests/net/mptcp/simult_flows.sh | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index aeedd822490c..a3f864cb0a02 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -9,7 +9,6 @@ optstring="S:R:d:e:l:r:h4cm:f:tC"
final_ret=0
cin_disconnect=""
ksft_skip=4
-capture=false
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
ipv6=true
@@ -21,7 +20,6 @@ sndbuf=0
rcvbuf=0
options_log=true
do_tcp=0
-checksum=false
filesize=0
connect_per_transfer=1
PORT=0
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d998c4a9cb07..db254496b43a 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -20,8 +20,6 @@ capout=""
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
-capture=false
-checksum=false
ip_mptcp=0
check_invert=0
validate_checksum=false
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 56aaa5350cb2..8c7f181768b3 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -23,6 +23,9 @@ readonly AF_INET6=10
TEST_COUNT=0
TEST_NAME=""
+capture=false
+checksum=false
+
MPTCP_LIB_SUBTESTS=()
sin=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 03e88b6c47d0..34981e88e129 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -4,7 +4,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
mptcp_lib_ns_init
-capture=false
ksft_skip=4
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 30/33] selftests: mptcp: diag: change timeout_poll to 30
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (28 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 29/33] selftests: mptcp: export capture/checksum vars Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 31/33] selftests: mptcp: export timeout_test to mptcp_lib Geliang Tang
` (2 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
In most scripts timeout_poll is defined to 30, but in diag.sh,
it's 100. To maintain consistency with other scripts, this patch
changes it to 30.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 4b0cc5c41188..216123547131 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,7 +5,7 @@
mptcp_lib_ns_init
ksft_skip=4
-timeout_poll=100
+timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
flush_pids()
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 31/33] selftests: mptcp: export timeout_test to mptcp_lib
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (29 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 30/33] selftests: mptcp: diag: change timeout_poll to 30 Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 32/33] selftests: mptcp: use KSFT_SKIP instead ksft_skip Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 33/33] selftests: mptcp: use KSFT_PASS and KSFT_FAIL Geliang Tang
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Move the variables 'timeout_poll' and 'timeout_test' into mptcp_lib.sh
as public variables.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 --
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 3 +++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 --
tools/testing/selftests/net/mptcp/simult_flows.sh | 2 --
6 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 216123547131..1752cf292588 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -5,8 +5,6 @@
mptcp_lib_ns_init
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
flush_pids()
{
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index a3f864cb0a02..356cbb2289be 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -9,8 +9,6 @@ optstring="S:R:d:e:l:r:h4cm:f:tC"
final_ret=0
cin_disconnect=""
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
ipv6=true
ethtool_random_on=true
tc_delay="$((RANDOM%50))"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index db254496b43a..824f2a3ed7c2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -18,8 +18,6 @@ cinsent=""
tmpfile=""
capout=""
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
ip_mptcp=0
check_invert=0
validate_checksum=false
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 8c7f181768b3..1f1e8c5e9540 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -26,6 +26,9 @@ TEST_NAME=""
capture=false
checksum=false
+readonly timeout_poll=30
+timeout_test=$((timeout_poll * 2 + 1))
+
MPTCP_LIB_SUBTESTS=()
sin=$(mktemp)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index ec829165d562..3305f1a7249b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -4,8 +4,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
mptcp_lib_ns_init
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 34981e88e129..dd249ba32cc2 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -5,8 +5,6 @@
mptcp_lib_ns_init
ksft_skip=4
-timeout_poll=30
-timeout_test=$((timeout_poll * 2 + 1))
bail=0
slack=50
large=""
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 32/33] selftests: mptcp: use KSFT_SKIP instead ksft_skip
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (30 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 31/33] selftests: mptcp: export timeout_test to mptcp_lib Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 33/33] selftests: mptcp: use KSFT_PASS and KSFT_FAIL Geliang Tang
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
This patch uses the public var KSFT_SKIP in mptcp_lib.sh instead of
ksft_skip, and drop every 'ksft_skip=4'.
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
tools/testing/selftests/net/mptcp/diag.sh | 1 -
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 3 +--
tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 ++++-----
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 10 +++++-----
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 --
tools/testing/selftests/net/mptcp/pm_netlink.sh | 2 --
tools/testing/selftests/net/mptcp/simult_flows.sh | 1 -
7 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh
index 1752cf292588..7d6656067cc2 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -4,7 +4,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
mptcp_lib_ns_init
-ksft_skip=4
flush_pids()
{
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 356cbb2289be..32a979a40a72 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -8,7 +8,6 @@ time_start=$(date +%s)
optstring="S:R:d:e:l:r:h4cm:f:tC"
final_ret=0
cin_disconnect=""
-ksft_skip=4
ipv6=true
ethtool_random_on=true
tc_delay="$((RANDOM%50))"
@@ -224,7 +223,7 @@ check_mptcp_disabled()
: "${rndh:?}"
local disabled_ns="ns_disabled-$rndh"
- ip netns add ${disabled_ns} || exit $ksft_skip
+ ip netns add ${disabled_ns} || exit ${KSFT_SKIP}
# net.mptcp.enabled should be enabled by default
if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ print $3 }')" -ne 1 ]; then
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 824f2a3ed7c2..81521e4760ae 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -17,7 +17,6 @@ cinfail=""
cinsent=""
tmpfile=""
capout=""
-ksft_skip=4
ip_mptcp=0
check_invert=0
validate_checksum=false
@@ -371,15 +370,15 @@ setup_fail_rules()
-p tcp \
-m length --length 150:9999 \
-m statistic --mode nth --packet 1 --every 99999 \
- -j MARK --set-mark 42 || return ${ksft_skip}
+ -j MARK --set-mark 42 || return ${KSFT_SKIP}
- tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${ksft_skip}
+ tc -n $ns2 qdisc add dev ns2eth$i clsact || return ${KSFT_SKIP}
tc -n $ns2 filter add dev ns2eth$i egress \
protocol ip prio 1000 \
handle 42 fw \
action pedit munge offset 148 u8 invert \
pipe csum tcp \
- index 100 || return ${ksft_skip}
+ index 100 || return ${KSFT_SKIP}
}
reset_with_fail()
@@ -393,7 +392,7 @@ reset_with_fail()
local rc=0
setup_fail_rules "${@}" || rc=$?
- if [ ${rc} -eq ${ksft_skip} ]; then
+ if [ ${rc} -eq ${KSFT_SKIP} ]; then
mark_as_skipped "unable to set the 'fail' rules"
return 1
fi
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 1f1e8c5e9540..5d0e3a56e975 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -507,7 +507,7 @@ mptcp_lib_ns_init() {
local netns
for netns in "$ns1" "$ns2" "$ns3" "$ns4"; do
- ip netns add $netns || exit ${ksft_skip}
+ ip netns add $netns || exit ${KSFT_SKIP}
ip -net $netns link set lo up
ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
@@ -541,7 +541,7 @@ mptcp_lib_check_tools() {
if [ "${1:-""}" == "ip" ]; then
if ! ip -Version &> /dev/null; then
mptcp_lib_print_warn "SKIP: Could not run test without ip tool"
- exit $ksft_skip
+ exit ${KSFT_SKIP}
fi
fi
@@ -549,7 +549,7 @@ mptcp_lib_check_tools() {
ss -h | grep -q MPTCP
if [ $? -ne 0 ];then
mptcp_lib_print_warn "SKIP: ss tool does not support MPTCP"
- exit $ksft_skip
+ exit ${KSFT_SKIP}
fi
fi
@@ -560,10 +560,10 @@ mptcp_lib_check_tools() {
ip6tables="ip6tables-legacy"
elif ! iptables -V &> /dev/null; then
mptcp_lib_print_warn "SKIP: Could not run all tests without iptables tool"
- exit $ksft_skip
+ exit ${KSFT_SKIP}
elif ! ip6tables -V &> /dev/null; then
mptcp_lib_print_warn "SKIP: Could not run all tests without ip6tables tool"
- exit $ksft_skip
+ exit ${KSFT_SKIP}
fi
fi
}
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 3305f1a7249b..75b9a6a5b5c4 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -3,8 +3,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-ksft_skip=4
-
mptcp_lib_ns_init
add_mark_rules()
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index 714f69de6fda..6ff0420b7ac1 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -3,8 +3,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
-ksft_skip=4
-
usage() {
echo "Usage: $0 [ -h ]"
}
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index dd249ba32cc2..ecf29ce332c5 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -4,7 +4,6 @@
. "$(dirname "${0}")/mptcp_lib.sh"
mptcp_lib_ns_init
-ksft_skip=4
bail=0
slack=50
large=""
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH mptcp-next v5 33/33] selftests: mptcp: use KSFT_PASS and KSFT_FAIL
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
` (31 preceding siblings ...)
2023-12-05 7:01 ` [PATCH mptcp-next v5 32/33] selftests: mptcp: use KSFT_SKIP instead ksft_skip Geliang Tang
@ 2023-12-05 7:01 ` Geliang Tang
32 siblings, 0 replies; 34+ messages in thread
From: Geliang Tang @ 2023-12-05 7:01 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Use KSFT_PASS and KSFT_FAIL macros instead of 0 and 1 after 'exit ' and
'ret=' in all scripts:
exit 0 -> exit ${KSFT_PASS}
exit 1 -> exit ${KSFT_FAIL}
ret=0 -> ret=${KSFT_PASS}
ret=1 -> ret=${KSFT_FAIL}
Signed-off-by: Geliang Tang <geliang.tang@linux.dev>
---
.../selftests/net/mptcp/mptcp_connect.sh | 18 +++++++++---------
.../testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
.../selftests/net/mptcp/mptcp_sockopt.sh | 4 ++--
.../testing/selftests/net/mptcp/pm_netlink.sh | 4 ++--
.../selftests/net/mptcp/simult_flows.sh | 4 ++--
.../selftests/net/mptcp/userspace_pm.sh | 4 ++--
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 32a979a40a72..a46bef3d4d1b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -51,14 +51,14 @@ while getopts "$optstring" option;do
case "$option" in
"h")
usage $0
- exit 0
+ exit ${KSFT_PASS}
;;
"d")
if [ $OPTARG -ge 0 ];then
tc_delay="$OPTARG"
else
echo "-d requires numeric argument, got \"$OPTARG\"" 1>&2
- exit 1
+ exit ${KSFT_FAIL}
fi
;;
"e")
@@ -82,7 +82,7 @@ while getopts "$optstring" option;do
sndbuf="$OPTARG"
else
echo "-S requires numeric argument, got \"$OPTARG\"" 1>&2
- exit 1
+ exit ${KSFT_FAIL}
fi
;;
"R")
@@ -90,7 +90,7 @@ while getopts "$optstring" option;do
rcvbuf="$OPTARG"
else
echo "-R requires numeric argument, got \"$OPTARG\"" 1>&2
- exit 1
+ exit ${KSFT_FAIL}
fi
;;
"m")
@@ -107,7 +107,7 @@ while getopts "$optstring" option;do
;;
"?")
usage $0
- exit 1
+ exit ${KSFT_FAIL}
;;
esac
done
@@ -230,7 +230,7 @@ check_mptcp_disabled()
echo -n -e "net.mptcp.enabled sysctl is not 1 by default\t\t"
mptcp_lib_print_err "\t\t [ FAIL ]"
mptcp_lib_result_fail "net.mptcp.enabled sysctl is not 1 by default"
- ret=1
+ ret=${KSFT_FAIL}
return 1
fi
ip netns exec ${disabled_ns} sysctl -q net.mptcp.enabled=0
@@ -244,7 +244,7 @@ check_mptcp_disabled()
echo -n -e "New MPTCP socket cannot be blocked via sysctl\t\t"
mptcp_lib_print_err "\t\t [ FAIL ]"
mptcp_lib_result_fail "New MPTCP socket cannot be blocked via sysctl"
- ret=1
+ ret=${KSFT_FAIL}
return 1
fi
@@ -271,7 +271,7 @@ do_ping()
if [ $rc -ne 0 ] ; then
echo "$listener_ns -> $connect_addr connectivity [ FAIL ]" 1>&2
- ret=1
+ ret=${KSFT_FAIL}
return 1
fi
@@ -782,7 +782,7 @@ log_if_error()
echo "FAIL: ${msg}" 1>&2
final_ret=${ret}
- ret=0
+ ret=${KSFT_PASS}
return ${final_ret}
fi
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 81521e4760ae..1243dd2305fe 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -427,7 +427,7 @@ reset_with_tcp_filter()
# $1: err msg
fail_test()
{
- ret=1
+ ret=${KSFT_FAIL}
print_fail "${@}"
@@ -3575,7 +3575,7 @@ usage()
{
if [ -n "${1}" ]; then
echo "${1}"
- ret=1
+ ret=${KSFT_FAIL}
fi
echo "mptcp_join usage:"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index 75b9a6a5b5c4..f2e7b2575106 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -85,7 +85,7 @@ check_mark()
for v in $values; do
if [ $v -ne 0 ]; then
echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected packets marked" 1>&2
- ret=1
+ ret=${KSFT_FAIL}
return 1
fi
done
@@ -155,7 +155,7 @@ do_transfer()
mptcp_lib_print_err "[ FAIL ]"
mptcp_lib_result_fail "transfer ${ip}"
- ret=1
+ ret=${KSFT_FAIL}
return 1
fi
mptcp_lib_print_ok "[ OK ]"
diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testing/selftests/net/mptcp/pm_netlink.sh
index 6ff0420b7ac1..dbf2dd435572 100755
--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh
+++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh
@@ -12,11 +12,11 @@ while getopts "$optstring" option;do
case "$option" in
"h")
usage $0
- exit 0
+ exit ${KSFT_PASS}
;;
"?")
usage $0
- exit 1
+ exit ${KSFT_FAIL}
;;
esac
done
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index ecf29ce332c5..060b9ea23041 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -240,7 +240,7 @@ while getopts "bcdh" option;do
case "$option" in
"h")
usage $0
- exit 0
+ exit ${KSFT_PASS}
;;
"b")
bail=1
@@ -253,7 +253,7 @@ while getopts "bcdh" option;do
;;
"?")
usage $0
- exit 1
+ exit ${KSFT_FAIL}
;;
esac
done
diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index ec3a68233577..2c1afea1f376 100755
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -70,7 +70,7 @@ test_skip()
test_fail()
{
mptcp_lib_print_err "[ FAIL ]${1:+ ${*}}"
- ret=1
+ ret=${KSFT_FAIL}
if [ -n "${1}" ]; then
_printf "\t%s\n" "${1}"
@@ -194,7 +194,7 @@ make_connection()
else
test_fail "Expected tokens (c:${client_token} - s:${server_token}) and server (c:${client_serverside} - s:${server_serverside})"
mptcp_lib_result_print_all_tap
- exit 1
+ exit ${KSFT_FAIL}
fi
if [ "$is_v6" = "v6" ]
--
2.35.3
^ permalink raw reply related [flat|nested] 34+ messages in thread
end of thread, other threads:[~2023-12-05 7:04 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-05 7:00 [PATCH mptcp-next v5 00/33] add helpers and vars in mptcp_lib.sh Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 01/33] selftests: mptcp: add mptcp_lib_evts_* helpers Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 02/33] selftests: mptcp: userspace: capitalize test_name Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 03/33] selftests: mptcp: userspace: print colored output Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 04/33] selftests: mptcp: capitalize ok/fail/skip Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 05/33] selftests: mptcp: extract mptcp_lib_check_expected Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 06/33] selftests: mptcp: export event macros in mptcp_lib Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 07/33] selftests: mptcp: add mptcp_lib_verify_listener_events Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 08/33] selftests: mptcp: unify namespace names Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 09/33] selftests: mptcp: add mptcp_lib_ns_* helpers Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 10/33] selftests: mptcp: add ss mptcp support checks Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 11/33] selftests: mptcp: add mptcp_lib_check_tools helper Geliang Tang
2023-12-05 7:00 ` [PATCH mptcp-next v5 12/33] selftests: mptcp: diag: print colored output Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 13/33] selftests: mptcp: connect: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 14/33] selftests: mptcp: sockopt: print every test result Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 15/33] selftests: mptcp: sockopt: print colored output Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 16/33] selftests: mptcp: simult flows: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 17/33] selftests: mptcp: connect: add PORT instead of TEST_COUNT Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 18/33] selftests: mptcp: connect: print out test counter Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 19/33] selftests: mptcp: rename test_cnt to TEST_COUNT Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 20/33] selftests: mptcp: diag: print out test counter Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 21/33] selftests: mptcp: simult flows: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 22/33] selftests: mptcp: sockopt: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 23/33] selftests: mptcp: netlink: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 24/33] selftests: mptcp: userspace: " Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 25/33] selftests: mptcp: export TEST_NAME/COUNT to mptcp_lib Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 26/33] selftests: mptcp: simult flows: define missing vars Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 27/33] selftests: mptcp: export cin/cout/sin/sout vars Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 28/33] selftests: mptcp: join: change capture/checksum as bool Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 29/33] selftests: mptcp: export capture/checksum vars Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 30/33] selftests: mptcp: diag: change timeout_poll to 30 Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 31/33] selftests: mptcp: export timeout_test to mptcp_lib Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 32/33] selftests: mptcp: use KSFT_SKIP instead ksft_skip Geliang Tang
2023-12-05 7:01 ` [PATCH mptcp-next v5 33/33] selftests: mptcp: use KSFT_PASS and KSFT_FAIL Geliang Tang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).