mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
275116d5d5
commit 452690be7de2f91cc0de68cb9e95252875b33503 upstream. This modification is linked to the parent commit where the received ADD_ADDR limit was accidentally reset when the endpoints were flushed. To validate that, the test is now flushing endpoints after having set new limits, and before checking them. 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:01cacb00b3("mptcp: add netlink-based PM") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-3-521fe9957892@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> [ Conflicts in pm_netlink.sh, because some refactoring have been done later on: commit3188309c8c("selftests: mptcp: netlink: add 'limits' helpers") and commitc99d57d000("selftests: mptcp: use pm_nl endpoint ops") are not in this version. The same operation can still be done at the same place, without using the new helper. ] Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
138 lines
3.3 KiB
Bash
Executable File
138 lines
3.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
. "$(dirname "${0}")/mptcp_lib.sh"
|
|
|
|
ksft_skip=4
|
|
ret=0
|
|
|
|
usage() {
|
|
echo "Usage: $0 [ -h ]"
|
|
}
|
|
|
|
|
|
while getopts "$optstring" option;do
|
|
case "$option" in
|
|
"h")
|
|
usage $0
|
|
exit 0
|
|
;;
|
|
"?")
|
|
usage $0
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
sec=$(date +%s)
|
|
rndh=$(printf %x $sec)-$(mktemp -u XXXXXX)
|
|
ns1="ns1-$rndh"
|
|
err=$(mktemp)
|
|
ret=0
|
|
|
|
cleanup()
|
|
{
|
|
rm -f $err
|
|
ip netns del $ns1
|
|
}
|
|
|
|
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
|
|
|
|
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()
|
|
{
|
|
local cmd="$1"
|
|
local expected="$2"
|
|
local msg="$3"
|
|
local out=`$cmd 2>$err`
|
|
local cmd_ret=$?
|
|
|
|
printf "%-50s %s" "$msg"
|
|
if [ $cmd_ret -ne 0 ]; then
|
|
echo "[FAIL] command execution '$cmd' stderr "
|
|
cat $err
|
|
ret=1
|
|
elif [ "$out" = "$expected" ]; then
|
|
echo "[ OK ]"
|
|
else
|
|
echo -n "[FAIL] "
|
|
echo "expected '$expected' got '$out'"
|
|
ret=1
|
|
fi
|
|
}
|
|
|
|
check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list"
|
|
|
|
default_limits="$(ip netns exec $ns1 ./pm_nl_ctl limits)"
|
|
if mptcp_lib_expect_all_features; then
|
|
check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0
|
|
subflows 0" "defaults limits"
|
|
fi
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 flags signal,backup
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1" "simple add/get addr"
|
|
|
|
check "ip netns exec $ns1 ./pm_nl_ctl dump" \
|
|
"id 1 flags 10.0.1.1
|
|
id 2 flags subflow dev lo 10.0.1.2
|
|
id 3 flags signal,backup 10.0.1.3" "dump addrs"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl del 2
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 2" "" "simple del addr"
|
|
check "ip netns exec $ns1 ./pm_nl_ctl dump" \
|
|
"id 1 flags 10.0.1.1
|
|
id 3 flags signal,backup 10.0.1.3" "dump addrs after del"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 4" "" "duplicate addr"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 id 10 flags signal
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 4" "id 4 flags signal 10.0.1.4" "id addr increment"
|
|
|
|
for i in `seq 5 9`; do
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.$i flags signal >/dev/null 2>&1
|
|
done
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 9" "id 9 flags signal 10.0.1.9" "hard addr limit"
|
|
check "ip netns exec $ns1 ./pm_nl_ctl get 10" "" "above hard addr limit"
|
|
|
|
for i in `seq 9 256`; do
|
|
ip netns exec $ns1 ./pm_nl_ctl del $i
|
|
ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9
|
|
done
|
|
check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1
|
|
id 3 flags signal,backup 10.0.1.3
|
|
id 4 flags signal 10.0.1.4
|
|
id 5 flags signal 10.0.1.5
|
|
id 6 flags signal 10.0.1.6
|
|
id 7 flags signal 10.0.1.7
|
|
id 8 flags signal 10.0.1.8" "id limit"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl flush
|
|
check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl limits 9 1
|
|
check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "rcv addrs above hard limit"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl limits 1 9
|
|
check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit"
|
|
|
|
ip netns exec $ns1 ./pm_nl_ctl limits 8 8
|
|
ip netns exec $ns1 ./pm_nl_ctl flush
|
|
check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8
|
|
subflows 8" "set limits"
|
|
|
|
exit $ret
|