Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6cce7bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'forwarding-selftest-fixes' 



David Ahern says:

====================
selftests: forwarding: misc bug fixes and enhancements

Bug fixes and an enhancement for the recent forwarding tests:
- only check tc version on tc tests
- handle multipath tests failing with 0 packet count
- fix ping command for IPv6 on Debian jessie
- improve summary of multipath tests

v2
- add CHECK_TC to bridge_vlan_aware.sh (Ido)
- dropped patch 2; always check for mz given its use
- fixed commit message for the last patch (Multipath: was dropped)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5f6f845b 36b4c0ad

tools/testing/selftests/net/forwarding/bridge_vlan_aware.sh

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=4

CHECK_TC="yes"

source lib.sh



h1_create()

tools/testing/selftests/net/forwarding/lib.sh

+18 −11
Original line number Diff line number Diff line
@@ -19,26 +19,33 @@ fi 
##############################################################################

# Sanity checks



if [[ "$(id -u)" -ne 0 ]]; then

	echo "SKIP: need root privileges"

	exit 0

fi



check_tc_version()

{

	tc -j &> /dev/null

	if [[ $? -ne 0 ]]; then

	echo "SKIP: iproute2 too old, missing JSON support"

	exit 0

		echo "SKIP: iproute2 too old; tc is missing JSON support"

		exit 1

	fi



	tc filter help 2>&1 | grep block &> /dev/null

	if [[ $? -ne 0 ]]; then

	echo "SKIP: iproute2 too old, missing shared block support"

		echo "SKIP: iproute2 too old; tc is missing shared block support"

		exit 1

	fi

}



if [[ "$(id -u)" -ne 0 ]]; then

	echo "SKIP: need root privileges"

	exit 0

fi



if [[ "$CHECK_TC" = "yes" ]]; then

	check_tc_version

fi



if [[ ! -x "$(command -v jq)" ]]; then

	echo "SKIP: jq not installed"

	exit 0

	exit 1

fi



if [[ ! -x "$(command -v $MZ)" ]]; then

tools/testing/selftests/net/forwarding/router_multipath.sh

+28 −18
Original line number Diff line number Diff line
@@ -160,14 +160,22 @@ router2_destroy() 


multipath_eval()

{

       local weight_rp12=$1

       local weight_rp13=$2

       local packets_rp12=$3

       local packets_rp13=$4

       local desc="$1"

       local weight_rp12=$2

       local weight_rp13=$3

       local packets_rp12=$4

       local packets_rp13=$5

       local weights_ratio packets_ratio diff



       RET=0



       if [[ "$packets_rp12" -eq "0" || "$packets_rp13" -eq "0" ]]; then

              check_err 1 "Packet difference is 0"

              log_test "Multipath"

              log_info "Expected ratio $weights_ratio"

              return

       fi



       if [[ "$weight_rp12" -gt "$weight_rp13" ]]; then

               weights_ratio=$(echo "scale=2; $weight_rp12 / $weight_rp13" \

		       | bc -l)
@@ -185,14 +193,15 @@ multipath_eval() 


       test "$(echo "$diff / $weights_ratio > 0.1" | bc -l)" -eq 0

       check_err $? "Too large discrepancy between expected and measured ratios"

       log_test "Multipath"

       log_test "$desc"

       log_info "Expected ratio $weights_ratio Measured ratio $packets_ratio"

}



multipath4_test()

{

       local weight_rp12=$1

       local weight_rp13=$2

       local desc="$1"

       local weight_rp12=$2

       local weight_rp13=$3

       local t0_rp12 t0_rp13 t1_rp12 t1_rp13

       local packets_rp12 packets_rp13

       local hash_policy
@@ -217,7 +226,7 @@ multipath4_test() 


       let "packets_rp12 = $t1_rp12 - $t0_rp12"

       let "packets_rp13 = $t1_rp13 - $t0_rp13"

       multipath_eval $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13

       multipath_eval "$desc" $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13



       # Restore settings.

       ip route replace 198.51.100.0/24 vrf vrf-r1 \
@@ -228,8 +237,9 @@ multipath4_test() 


multipath6_test()

{

       local weight_rp12=$1

       local weight_rp13=$2

       local desc="$1"

       local weight_rp12=$2

       local weight_rp13=$3

       local t0_rp12 t0_rp13 t1_rp12 t1_rp13

       local packets_rp12 packets_rp13
@@ -242,7 +252,7 @@ multipath6_test() 


       # Generate 16384 echo requests, each with a random flow label.

       for _ in $(seq 1 16384); do

	       ip vrf exec vrf-h1 ping 2001:db8:2::2 -F 0 -c 1 -q &> /dev/null

	       ip vrf exec vrf-h1 $PING6 2001:db8:2::2 -F 0 -c 1 -q &> /dev/null

       done



       t1_rp12=$(link_stats_tx_packets_get $rp12)
@@ -250,7 +260,7 @@ multipath6_test() 


       let "packets_rp12 = $t1_rp12 - $t0_rp12"

       let "packets_rp13 = $t1_rp13 - $t0_rp13"

       multipath_eval $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13

       multipath_eval "$desc" $weight_rp12 $weight_rp13 $packets_rp12 $packets_rp13



       ip route replace 2001:db8:2::/64 vrf vrf-r1 \

	       nexthop via fe80:2::22 dev $rp12 \
@@ -260,14 +270,14 @@ multipath6_test() 
multipath_test()

{

	log_info "Running IPv4 multipath tests"

	multipath4_test 1 1

	multipath4_test 2 1

	multipath4_test 11 45

	multipath4_test "ECMP" 1 1

	multipath4_test "Weighted MP 2:1" 2 1

	multipath4_test "Weighted MP 11:45" 11 45



	log_info "Running IPv6 multipath tests"

	multipath6_test 1 1

	multipath6_test 2 1

	multipath6_test 11 45

	multipath6_test "ECMP" 1 1

	multipath6_test "Weighted MP 2:1" 2 1

	multipath6_test "Weighted MP 11:45" 11 45

}



setup_prepare()

tools/testing/selftests/net/forwarding/tc_actions.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=4

source lib.sh

source tc_common.sh

source lib.sh



tcflags="skip_hw"

tools/testing/selftests/net/forwarding/tc_chains.sh

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# SPDX-License-Identifier: GPL-2.0



NUM_NETIFS=2

source lib.sh

source tc_common.sh

source lib.sh



tcflags="skip_hw"