Commit 22724c89 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski

selftests: mptcp: test last time mptcp_info

This patch adds a new helper chk_msk_info() to show the counters in
mptcp_info of the given info, and check that the timestamps move
forward. Use it to show newly added last_data_sent, last_data_recv
and last_ack_recv in mptcp_info in chk_last_time_info().
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240410-upstream-net-next-20240405-mptcp-last-time-info-v2-2-f95bd6b33e51@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 18d82cde
......@@ -200,6 +200,58 @@ chk_msk_cestab()
"${expected}" "${msg}" ""
}
msk_info_get_value()
{
local port="${1}"
local info="${2}"
ss -N "${ns}" -inHM dport "${port}" | \
mptcp_lib_get_info_value "${info}" "${info}"
}
chk_msk_info()
{
local port="${1}"
local info="${2}"
local cnt="${3}"
local msg="....chk ${info}"
local delta_ms=250 # half what we waited before, just to be sure
local now
now=$(msk_info_get_value "${port}" "${info}")
mptcp_lib_print_title "${msg}"
if { [ -z "${cnt}" ] || [ -z "${now}" ]; } &&
! mptcp_lib_expect_all_features; then
mptcp_lib_pr_skip "Feature probably not supported"
mptcp_lib_result_skip "${msg}"
elif [ "$((cnt + delta_ms))" -lt "${now}" ]; then
mptcp_lib_pr_ok
mptcp_lib_result_pass "${msg}"
else
mptcp_lib_pr_fail "value of ${info} changed by $((now - cnt))ms," \
"expected at least ${delta_ms}ms"
mptcp_lib_result_fail "${msg}"
ret=${KSFT_FAIL}
fi
}
chk_last_time_info()
{
local port="${1}"
local data_sent data_recv ack_recv
data_sent=$(msk_info_get_value "${port}" "last_data_sent")
data_recv=$(msk_info_get_value "${port}" "last_data_recv")
ack_recv=$(msk_info_get_value "${port}" "last_ack_recv")
sleep 0.5 # wait to check after if the timestamps difference
chk_msk_info "${port}" "last_data_sent" "${data_sent}"
chk_msk_info "${port}" "last_data_recv" "${data_recv}"
chk_msk_info "${port}" "last_ack_recv" "${ack_recv}"
}
wait_connected()
{
local listener_ns="${1}"
......@@ -233,6 +285,7 @@ echo "b" | \
127.0.0.1 >/dev/null &
wait_connected $ns 10000
chk_msk_nr 2 "after MPC handshake "
chk_last_time_info 10000
chk_msk_remote_key_nr 2 "....chk remote_key"
chk_msk_fallback_nr 0 "....chk no fallback"
chk_msk_inuse 2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment