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

Merge branch 'mlxsw-selftests-updates' 



Ido Schimmel says:

====================
selftests: mlxsw: Various updates

This patchset contains various updates to mlxsw selftests.

Patch #1 replaces open-coded compatibility checks with dedicated
helpers. These helpers are used to skip tests when run on incompatible
machines.

Patch #2 avoids spurious failures in some tests by using permanent
neighbours instead of reachable ones.

Patch #3 reduces the run time of a test by not iterating over all the
available trap policers.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 71de5b23 e8604196

tools/testing/selftests/drivers/net/mlxsw/devlink_trap_control.sh

+3 −4
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ ALL_TESTS=" 
NUM_NETIFS=4

source $lib_dir/lib.sh

source $lib_dir/devlink_lib.sh

source mlxsw_lib.sh



h1_create()

{
@@ -626,8 +627,7 @@ ipv6_redirect_test() 


ptp_event_test()

{

	# PTP is only supported on Spectrum-1, for now.

	[[ "$DEVLINK_VIDDID" != "15b3:cb84" ]] && return

	mlxsw_only_on_spectrum 1 || return



	# PTP Sync (0)

	devlink_trap_stats_test "PTP Time-Critical Event Message" "ptp_event" \
@@ -638,8 +638,7 @@ ptp_event_test() 


ptp_general_test()

{

	# PTP is only supported on Spectrum-1, for now.

	[[ "$DEVLINK_VIDDID" != "15b3:cb84" ]] && return

	mlxsw_only_on_spectrum 1 || return



	# PTP Announce (b)

	devlink_trap_stats_test "PTP General Message" "ptp_general" \

tools/testing/selftests/drivers/net/mlxsw/devlink_trap_policer.sh

+20 −12
Original line number Diff line number Diff line
@@ -272,13 +272,17 @@ __rate_test() 


rate_test()

{

	local id

	local last_policer=$(devlink -j -p trap policer show |

			     jq '[.[]["'$DEVLINK_DEV'"][].policer] | max')



	for id in $(devlink_trap_policer_ids_get); do

		echo

		log_info "Running rate test for policer $id"

		__rate_test $id

	done

	log_info "Running rate test for policer 1"

	__rate_test 1



	log_info "Running rate test for policer $((last_policer / 2))"

	__rate_test $((last_policer / 2))



	log_info "Running rate test for policer $last_policer"

	__rate_test $last_policer

}



__burst_test()
@@ -342,13 +346,17 @@ __burst_test() 


burst_test()

{

	local id

	local last_policer=$(devlink -j -p trap policer show |

			     jq '[.[]["'$DEVLINK_DEV'"][].policer] | max')



	log_info "Running burst test for policer 1"

	__burst_test 1



	log_info "Running burst test for policer $((last_policer / 2))"

	__burst_test $((last_policer / 2))



	for id in $(devlink_trap_policer_ids_get); do

		echo

		log_info "Running burst size test for policer $id"

		__burst_test $id

	done

	log_info "Running burst test for policer $last_policer"

	__burst_test $last_policer

}



trap cleanup EXIT

tools/testing/selftests/drivers/net/mlxsw/mlxsw_lib.sh

+50 −0
Original line number Diff line number Diff line
@@ -11,3 +11,53 @@ if [[ ! -v MLXSW_CHIP ]]; then 
		exit 1

	fi

fi



MLXSW_SPECTRUM_REV=$(case $MLXSW_CHIP in

			     mlxsw_spectrum)

				     echo 1 ;;

			     mlxsw_spectrum*)

				     echo ${MLXSW_CHIP#mlxsw_spectrum} ;;

			     *)

				     echo "Couldn't determine Spectrum chip revision." \

					  > /dev/stderr ;;

		     esac)



mlxsw_on_spectrum()

{

	local rev=$1; shift

	local op="=="

	local rev2=${rev%+}



	if [[ $rev2 != $rev ]]; then

		op=">="

	fi



	((MLXSW_SPECTRUM_REV $op rev2))

}



__mlxsw_only_on_spectrum()

{

	local rev=$1; shift

	local caller=$1; shift

	local src=$1; shift



	if ! mlxsw_on_spectrum "$rev"; then

		log_test_skip $src:$caller "(Spectrum-$rev only)"

		return 1

	fi

}



mlxsw_only_on_spectrum()

{

	local caller=${FUNCNAME[1]}

	local src=${BASH_SOURCE[1]}

	local rev



	for rev in "$@"; do

		if __mlxsw_only_on_spectrum "$rev" "$caller" "$src"; then

			return 0

		fi

	done



	return 1

}

tools/testing/selftests/drivers/net/mlxsw/rtnetlink.sh

+11 −11
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ nexthop_obj_offload_test() 
	setup_wait



	ip nexthop add id 1 via 192.0.2.2 dev $swp1

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1



	busywait "$TIMEOUT" wait_for_offload \
@@ -791,7 +791,7 @@ nexthop_obj_offload_test() 
		ip nexthop show id 1

	check_err $? "nexthop marked as offloaded after setting neigh to failed state"



	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	busywait "$TIMEOUT" wait_for_offload \

		ip nexthop show id 1
@@ -828,11 +828,11 @@ nexthop_obj_group_offload_test() 
	ip nexthop add id 1 via 192.0.2.2 dev $swp1

	ip nexthop add id 2 via 2001:db8:1::2 dev $swp1

	ip nexthop add id 10 group 1/2

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1



	busywait "$TIMEOUT" wait_for_offload \
@@ -888,11 +888,11 @@ nexthop_obj_bucket_offload_test() 
	ip nexthop add id 1 via 192.0.2.2 dev $swp1

	ip nexthop add id 2 via 2001:db8:1::2 dev $swp1

	ip nexthop add id 10 group 1/2 type resilient buckets 32 idle_timer 0

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1



	busywait "$TIMEOUT" wait_for_offload \
@@ -921,7 +921,7 @@ nexthop_obj_bucket_offload_test() 
	check_err $? "nexthop bucket not marked as offloaded after revalidating nexthop"



	# Revalidate nexthop id 2 by changing its neighbour

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 2001:db8:1::2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	busywait "$TIMEOUT" wait_for_offload \

		ip nexthop bucket show nhid 2
@@ -971,9 +971,9 @@ nexthop_obj_route_offload_test() 
	setup_wait



	ip nexthop add id 1 via 192.0.2.2 dev $swp1

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.2 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud reachable \

	ip neigh replace 192.0.2.3 lladdr 00:11:22:33:44:55 nud perm \

		dev $swp1



	ip route replace 198.51.100.0/24 nhid 1

tools/testing/selftests/drivers/net/mlxsw/sch_red_core.sh

+6 −4
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ CHECK_TC="yes" 
lib_dir=$(dirname $0)/../../../net/forwarding

source $lib_dir/lib.sh

source $lib_dir/devlink_lib.sh

source mlxsw_lib.sh

source qos_lib.sh



ipaddr()
@@ -479,10 +480,7 @@ do_ecn_test_perband() 
	local vlan=$1; shift

	local limit=$1; shift



	# Per-band ECN counters are not supported on Spectrum-1 and Spectrum-2.

	[[ "$DEVLINK_VIDDID" == "15b3:cb84" ||

	   "$DEVLINK_VIDDID" == "15b3:cf6c" ]] && return



	mlxsw_only_on_spectrum 3+ || return

	__do_ecn_test get_qdisc_nmarked "$vlan" "$limit" "per-band ECN"

}
@@ -584,6 +582,8 @@ do_mark_test() 
	local should_fail=$1; shift

	local base



	mlxsw_only_on_spectrum 2+ || return



	RET=0



	start_tcp_traffic $h1.$vlan $(ipaddr 1 $vlan) $(ipaddr 3 $vlan) \
@@ -632,6 +632,8 @@ do_drop_test() 
	local base

	local now



	mlxsw_only_on_spectrum 2+ || return



	RET=0



	start_traffic $h1.$vlan $(ipaddr 1 $vlan) $(ipaddr 3 $vlan) $h3_mac