mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-07-08 18:13:59 +02:00
selftests: mptcp: join: validate event numbers
commit20ccc7c5f7upstream. This test extends "delete and re-add" and "delete re-add signal" to validate the previous commit: the number of MPTCP events are checked to make sure there are no duplicated or unexpected ones. A new helper has been introduced to easily check these events. The missing events have been added to the lib. The 'Fixes' tag here below is the same as the one from the previous commit: this patch here is not fixing anything wrong in the selftests, but it validates the previous fix for an issue introduced by this commit ID. Fixes:b911c97c7d("mptcp: add netlink event support") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com> [ Conflicts in mptcp_join.sh and mptcp_lib.sh, due to commit38f027fca1("selftests: mptcp: dump userspace addrs list") -- linked to a new feature, not backportable to stable -- and commit23a0485d1c("selftests: mptcp: declare event macros in mptcp_lib") -- depending on the previous one -- not in this version. The conflicts in mptcp_join.sh were in the context, because a new helper had to be added after others that are not in this version. The conflicts in mptcp_lib.sh were due to the fact the other MPTCP_LIB_EVENT_* constants were not present. They have all been added in this version to ease future backports if any. In this version, it was also needed to import reset_with_events and kill_events_pids from the newer version, and adapt chk_evt_nr to how the results are printed in this version, plus remove the LISTENER events checks because the linked feature is not available in this kernel version. ] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthieu Baerts (NGI0)
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
441b39fb79
commit
5dc9170eee
@@ -394,6 +394,25 @@ reset_with_fail()
|
||||
fi
|
||||
}
|
||||
|
||||
start_events()
|
||||
{
|
||||
evts_ns1=$(mktemp)
|
||||
evts_ns2=$(mktemp)
|
||||
:> "$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=$!
|
||||
}
|
||||
|
||||
reset_with_events()
|
||||
{
|
||||
reset "${1}" || return 1
|
||||
|
||||
start_events
|
||||
}
|
||||
|
||||
reset_with_tcp_filter()
|
||||
{
|
||||
reset "${1}" || return 1
|
||||
@@ -596,6 +615,14 @@ kill_tests_wait()
|
||||
wait
|
||||
}
|
||||
|
||||
kill_events_pids()
|
||||
{
|
||||
kill_wait $evts_ns1_pid
|
||||
evts_ns1_pid=0
|
||||
kill_wait $evts_ns2_pid
|
||||
evts_ns2_pid=0
|
||||
}
|
||||
|
||||
pm_nl_set_limits()
|
||||
{
|
||||
local ns=$1
|
||||
@@ -3143,6 +3170,32 @@ fail_tests()
|
||||
fi
|
||||
}
|
||||
|
||||
# $1: ns ; $2: event type ; $3: count
|
||||
chk_evt_nr()
|
||||
{
|
||||
local ns=${1}
|
||||
local evt_name="${2}"
|
||||
local exp="${3}"
|
||||
|
||||
local evts="${evts_ns1}"
|
||||
local evt="${!evt_name}"
|
||||
local count
|
||||
|
||||
evt_name="${evt_name:16}" # without MPTCP_LIB_EVENT_
|
||||
[ "${ns}" == "ns2" ] && evts="${evts_ns2}"
|
||||
|
||||
printf "%-${nr_blank}s %s" " " "event ${ns} ${evt_name} (${exp})"
|
||||
|
||||
count=$(grep -cw "type:${evt}" "${evts}")
|
||||
if [ "${count}" != "${exp}" ]; then
|
||||
echo "[fail] got $count events, expected $exp"
|
||||
fail_test
|
||||
dump_stats
|
||||
else
|
||||
echo "[ ok ]"
|
||||
fi
|
||||
}
|
||||
|
||||
userspace_tests()
|
||||
{
|
||||
# userspace pm type prevents add_addr
|
||||
@@ -3265,11 +3318,13 @@ endpoint_tests()
|
||||
|
||||
if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT &&
|
||||
mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
|
||||
start_events
|
||||
pm_nl_set_limits $ns1 0 3
|
||||
pm_nl_set_limits $ns2 0 3
|
||||
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
|
||||
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
|
||||
run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_5 2>/dev/null &
|
||||
local tests_pid=$!
|
||||
|
||||
wait_mpj $ns2
|
||||
pm_nl_del_endpoint $ns2 2 10.0.2.2
|
||||
@@ -3301,14 +3356,30 @@ endpoint_tests()
|
||||
chk_subflow_nr "" "after re-add id 0 ($i)" 3
|
||||
done
|
||||
|
||||
kill_wait "${tests_pid}"
|
||||
kill_events_pids
|
||||
kill_tests_wait
|
||||
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_CREATED 1
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_ESTABLISHED 1
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_ANNOUNCED 0
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_REMOVED 4
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_ESTABLISHED 6
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_CLOSED 4
|
||||
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_CREATED 1
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_ANNOUNCED 0
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_REMOVED 0
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 6
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 5 # one has been closed before estab
|
||||
|
||||
chk_join_nr 6 6 6
|
||||
chk_rm_nr 4 4
|
||||
fi
|
||||
|
||||
# remove and re-add
|
||||
if reset "delete re-add signal" &&
|
||||
if reset_with_events "delete re-add signal" &&
|
||||
mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
|
||||
pm_nl_set_limits $ns1 0 3
|
||||
pm_nl_set_limits $ns2 3 3
|
||||
@@ -3339,8 +3410,25 @@ endpoint_tests()
|
||||
pm_nl_add_endpoint $ns1 10.0.1.1 id 99 flags signal
|
||||
wait_mpj $ns2
|
||||
chk_subflow_nr "" "after re-add" 3
|
||||
|
||||
kill_wait "${tests_pid}"
|
||||
kill_events_pids
|
||||
kill_tests_wait
|
||||
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_CREATED 1
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_ESTABLISHED 1
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_ANNOUNCED 0
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_REMOVED 0
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_ESTABLISHED 4
|
||||
chk_evt_nr ns1 MPTCP_LIB_EVENT_SUB_CLOSED 2
|
||||
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_CREATED 1
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_ANNOUNCED 5
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_REMOVED 3
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_ESTABLISHED 4
|
||||
chk_evt_nr ns2 MPTCP_LIB_EVENT_SUB_CLOSED 2
|
||||
|
||||
chk_join_nr 4 4 4
|
||||
chk_add_nr 5 5
|
||||
chk_rm_nr 3 2 invert
|
||||
|
||||
@@ -4,6 +4,21 @@
|
||||
readonly KSFT_FAIL=1
|
||||
readonly KSFT_SKIP=4
|
||||
|
||||
# These variables are used in some selftests, read-only
|
||||
declare -rx MPTCP_LIB_EVENT_CREATED=1 # MPTCP_EVENT_CREATED
|
||||
declare -rx MPTCP_LIB_EVENT_ESTABLISHED=2 # MPTCP_EVENT_ESTABLISHED
|
||||
declare -rx MPTCP_LIB_EVENT_CLOSED=3 # MPTCP_EVENT_CLOSED
|
||||
declare -rx MPTCP_LIB_EVENT_ANNOUNCED=6 # MPTCP_EVENT_ANNOUNCED
|
||||
declare -rx MPTCP_LIB_EVENT_REMOVED=7 # MPTCP_EVENT_REMOVED
|
||||
declare -rx MPTCP_LIB_EVENT_SUB_ESTABLISHED=10 # MPTCP_EVENT_SUB_ESTABLISHED
|
||||
declare -rx MPTCP_LIB_EVENT_SUB_CLOSED=11 # MPTCP_EVENT_SUB_CLOSED
|
||||
declare -rx MPTCP_LIB_EVENT_SUB_PRIORITY=13 # MPTCP_EVENT_SUB_PRIORITY
|
||||
declare -rx MPTCP_LIB_EVENT_LISTENER_CREATED=15 # MPTCP_EVENT_LISTENER_CREATED
|
||||
declare -rx MPTCP_LIB_EVENT_LISTENER_CLOSED=16 # MPTCP_EVENT_LISTENER_CLOSED
|
||||
|
||||
declare -rx MPTCP_LIB_AF_INET=2
|
||||
declare -rx MPTCP_LIB_AF_INET6=10
|
||||
|
||||
# SELFTESTS_MPTCP_LIB_EXPECT_ALL_FEATURES env var can be set when validating all
|
||||
# features using the last version of the kernel and the selftests to make sure
|
||||
# a test is not being skipped by mistake.
|
||||
|
||||
Reference in New Issue
Block a user