Commit 5e0cfb49 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

selftests: mptcp: print test results with counters 

mainline inclusion
from mainline-v6.9-rc1
commit aa7694766f1458a158944b18d3c7b4fbaed08510
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=aa7694766f1458a158944b18d3c7b4fbaed08510



--------------------------------

This patch adds a new helper mptcp_lib_print_title(), a wrapper of
mptcp_lib_inc_test_counter() and mptcp_lib_pr_title_counter(), to
print out test counter in each test result and increase the counter.
Use this helper to print out test counters for every tests in diag.sh,
mptcp_connect.sh, mptcp_sockopt.sh, pm_netlink.sh, simult_flows.sh,
and userspace_pm.sh.

diag.sh:

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  ]

mptcp_connect.sh:

01 New MPTCP socket can be blocked via sysctl                       [ OK ]
02 Validating network environment with pings                        [ OK ]
INFO: Using loss of 0.85% delay 31 ms reorder .. with delay 7ms on ns3eth4
03 ns1 MPTCP -> ns1 (10.0.1.1:10000  ) MPTCP     (duration    69ms) [ OK ]
04 ns1 MPTCP -> ns1 (10.0.1.1:10001  ) TCP       (duration    20ms) [ OK ]
05 ns1 TCP   -> ns1 (10.0.1.1:10002  ) MPTCP     (duration    16ms) [ OK ]

mptcp_sockopt.sh:

01 Transfer v4                                       [ OK ]
02 Mark v4                                           [ OK ]
03 Transfer v6                                       [ OK ]
04 Mark v6                                           [ OK ]
05 SOL_MPTCP sockopt v4                              [ OK ]

pm_netlink.sh:

01 defaults addr list                                [ OK ]
02 simple add/get addr                               [ OK ]
03 dump addrs                                        [ OK ]
04 simple del addr                                   [ OK ]
05 dump addrs after del                              [ OK ]

simult_flows.sh:

01 balanced bwidth                                     7391 max 8456 [ OK ]
02 balanced bwidth - reverse direction                 7403 max 8456 [ OK ]
03 balanced bwidth with unbalanced delay               7429 max 8456 [ OK ]
04 balanced bwidth with unbalanced delay - reverse ... 7485 max 8456 [ OK ]
05 unbalanced bwidth                                   7549 max 8456 [ OK ]

userspace_pm.sh:

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:67 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: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-7-4f42c347b653@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>

(backported from commit aa7694766f1458a158944b18d3c7b4fbaed08510)

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Change-Id: I6fd9968ed2f597c44b8f636cd6720e962e8b1818
Reviewed-on: http://gerrit.kylin.com/c/klinux/+/100121


Code-Style: k2ci <kernel-bot@kylinos.cn>
Tested-by: default avatark2ci <kernel-bot@kylinos.cn>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
parent 2ab8354c

tools/testing/selftests/net/mptcp/diag.sh

+2 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ __chk_nr() 


	nr=$(eval $command)



	printf "%-50s" "$msg"

	mptcp_lib_print_title "$msg"

	if [ "$nr" != "$expected" ]; then

		if [ "$nr" = "$skip" ] && ! mptcp_lib_expect_all_features; then

			echo "[ skip ] Feature probably not supported"
@@ -68,7 +68,6 @@ __chk_nr() 
		echo "[  ok  ]"

		mptcp_lib_result_pass "${msg}"

	fi

	MPTCP_LIB_TEST_COUNTER=$((MPTCP_LIB_TEST_COUNTER+1))

}



__chk_msk_nr()
@@ -113,7 +112,7 @@ wait_msk_nr() 
		sleep 1

	done



	printf "%-50s" "$msg"

	mptcp_lib_print_title "$msg"

	if [ $i -ge $timeout ]; then

		echo "[ fail ] timeout while expecting $expected max $max last $nr"

		mptcp_lib_result_fail "${msg} # timeout"
@@ -126,7 +125,6 @@ wait_msk_nr() 
		echo "[  ok  ]"

		mptcp_lib_result_pass "${msg}"

	fi

	MPTCP_LIB_TEST_COUNTER=$((MPTCP_LIB_TEST_COUNTER+1))

}



chk_msk_fallback_nr()

tools/testing/selftests/net/mptcp/mptcp_connect.sh

+3 −3
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ fi 


print_larger_title() {

	# here we don't have the time, a bit longer for the alignment

	printf "%-69s" "${@}"

	MPTCP_LIB_TEST_FORMAT="%02u %-69s" \

		mptcp_lib_print_title "${@}"

}



check_mptcp_disabled()
@@ -320,7 +321,6 @@ do_transfer() 
	local extra_args="$7"



	port=$((port + 1))

	MPTCP_LIB_TEST_COUNTER=$((MPTCP_LIB_TEST_COUNTER+1))



	if [ "$rcvbuf" -gt 0 ]; then

		extra_args+=" -R $rcvbuf"
@@ -347,7 +347,7 @@ do_transfer() 
	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})"

	printf "%-50s" "${result_msg}"

	mptcp_lib_print_title "${result_msg}"



	if $capture; then

		local capuser

tools/testing/selftests/net/mptcp/mptcp_sockopt.sh

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ check_mark() 


print_title()

{

	printf "%-50s" "${@}"

	mptcp_lib_print_title "${@}"

}



do_transfer()

tools/testing/selftests/net/mptcp/pm_netlink.sh

+3 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ check() 
	local msg="$3"

	local rc=0



	printf "%-50s" "$msg"

	mptcp_lib_print_title "$msg"

	mptcp_lib_check_output "${err}" "${cmd}" "${expected}" || rc=${?}

	if [ ${rc} -eq 2 ]; then

		mptcp_lib_result_fail "${msg} # error ${rc}"
@@ -189,7 +189,8 @@ subflow,backup,fullmesh 10.0.1.1" " (backup,fullmesh)" 
else

	for st in fullmesh nofullmesh backup,fullmesh; do

		st="          (${st})"

		printf "%-50s%s\n" "${st}" "[SKIP]"

		mptcp_lib_print_title "${st}"

		echo "[SKIP]"

		mptcp_lib_result_skip "${st}"

	done

fi

tools/testing/selftests/net/mptcp/simult_flows.sh

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ ns3="" 
capture=false

timeout_poll=30

timeout_test=$((timeout_poll * 2 + 1))

# a bit more space: because we have more to display

MPTCP_LIB_TEST_FORMAT="%02u %-60s"

ret=0

bail=0

slack=50
@@ -126,7 +128,6 @@ do_transfer() 
	local max_time=$3

	local port

	port=$((10000+MPTCP_LIB_TEST_COUNTER))

	MPTCP_LIB_TEST_COUNTER=$((MPTCP_LIB_TEST_COUNTER+1))



	:> "$cout"

	:> "$sout"
@@ -238,7 +239,7 @@ run_test() 
	# completion (see mptcp_connect): 200ms on each side, add some slack

	time=$((time + 400 + slack))



	printf "%-60s" "$msg"

	mptcp_lib_print_title "$msg"

	do_transfer $small $large $time

	lret=$?

	mptcp_lib_result_code "${lret}" "${msg}"
@@ -248,7 +249,7 @@ run_test() 
	fi



	msg+=" - reverse direction"

	printf "%-60s" "${msg}"

	mptcp_lib_print_title "${msg}"

	do_transfer $large $small $time

	lret=$?

	mptcp_lib_result_code "${lret}" "${msg}"