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

Merge branch 'selftests-updates-for-mlxsw-driver-test' 



Jiri Pirko says:

====================
selftests: updates for mlxsw driver test

This patchset contains tweaks to the existing tests and is also adding
couple of new ones, namely tests for shared buffer and red offload.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b99e54b 3eba4137

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

+3 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ ALL_TESTS=" 
	blackhole_ipv6

"

NUM_NETIFS=4

: ${TIMEOUT:=20000} # ms

source $lib_dir/tc_common.sh

source $lib_dir/lib.sh
@@ -123,7 +124,7 @@ blackhole_ipv4() 
		skip_hw dst_ip 198.51.100.1 src_ip 192.0.2.1 ip_proto icmp \

		action pass



	ip -4 route show 198.51.100.0/30 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload ip -4 route show 198.51.100.0/30

	check_err $? "route not marked as offloaded when should"



	ping_do $h1 198.51.100.1
@@ -147,7 +148,7 @@ blackhole_ipv6() 
		skip_hw dst_ip 2001:db8:2::1 src_ip 2001:db8:1::1 \

		ip_proto icmpv6 action pass



	ip -6 route show 2001:db8:2::/120 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload ip -6 route show 2001:db8:2::/120

	check_err $? "route not marked as offloaded when should"



	ping6_do $h1 2001:db8:2::1

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

+3 −8
Original line number Diff line number Diff line
@@ -641,13 +641,9 @@ erif_disabled_test() 
	mz_pid=$!



	sleep 5

	# In order to see this trap we need a route that points to disabled RIF.

	# When ipv6 address is flushed, there is a delay and the routes are

	# deleted before the RIF and we cannot get state that we have route

	# to disabled RIF.

	# Delete IPv6 address first and then check this trap with flushing IPv4.

	ip -6 add flush dev br0

	ip -4 add flush dev br0

	# Unlinking the port from the bridge will disable the RIF associated

	# with br0 as it is no longer an upper of any mlxsw port.

	ip link set dev $rp1 nomaster



	t1_packets=$(devlink_trap_rx_packets_get $trap_name)

	t1_bytes=$(devlink_trap_rx_bytes_get $trap_name)
@@ -659,7 +655,6 @@ erif_disabled_test() 
	log_test "Egress RIF disabled"



	kill $mz_pid && wait $mz_pid &> /dev/null

	ip link set dev $rp1 nomaster

	__addr_add_del $rp1 add 192.0.2.2/24 2001:db8:1::2/64

	ip link del dev br0 type bridge

	devlink_trap_action_set $trap_name "drop"

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

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0



##############################################################################

# Defines



if [[ ! -v MLXSW_CHIP ]]; then

	MLXSW_CHIP=$(devlink -j dev info $DEVLINK_DEV | jq -r '.[][]["driver"]')

	if [ -z "$MLXSW_CHIP" ]; then

		echo "SKIP: Device $DEVLINK_DEV doesn't support devlink info command"

		exit 1

	fi

fi

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

+14 −39
Original line number Diff line number Diff line
@@ -2,16 +2,15 @@ 
# SPDX-License-Identifier: GPL-2.0



ROUTER_NUM_NETIFS=4

: ${TIMEOUT:=20000} # ms



router_h1_create()

{

	simple_if_init $h1 192.0.1.1/24

	ip route add 193.0.0.0/8 via 192.0.1.2 dev $h1

}



router_h1_destroy()

{

	ip route del 193.0.0.0/8 via 192.0.1.2 dev $h1

	simple_if_fini $h1 192.0.1.1/24

}
@@ -64,13 +63,15 @@ router_setup_prepare() 
	router_create

}



router_offload_validate()

wait_for_routes()

{

	local route_count=$1

	local offloaded_count

	local t0=$1; shift

	local route_count=$1; shift



	offloaded_count=$(ip route | grep -o 'offload' | wc -l)

	[[ $offloaded_count -ge $route_count ]]

	local t1=$(ip route | grep -o 'offload' | wc -l)

	local delta=$((t1 - t0))

	echo $delta

	[[ $delta -ge $route_count ]]

}



router_routes_create()
@@ -90,8 +91,8 @@ router_routes_create() 
					break 3

				fi



				echo route add 193.${i}.${j}.${k}/32 via \

				       192.0.2.1 dev $rp2  >> $ROUTE_FILE

				echo route add 193.${i}.${j}.${k}/32 dev $rp2 \

					>> $ROUTE_FILE

				((count++))

			done

		done
@@ -111,45 +112,19 @@ router_test() 
{

	local route_count=$1

	local should_fail=$2

	local count=0

	local delta



	RET=0



	local t0=$(ip route | grep -o 'offload' | wc -l)

	router_routes_create $route_count

	delta=$(busywait "$TIMEOUT" wait_for_routes $t0 $route_count)



	router_offload_validate $route_count

	check_err_fail $should_fail $? "Offload of $route_count routes"

	check_err_fail $should_fail $? "Offload routes: Expected $route_count, got $delta."

	if [[ $RET -ne 0 ]] || [[ $should_fail -eq 1 ]]; then

		return

	fi



	tc filter add dev $h2 ingress protocol ip pref 1 flower \

		skip_sw dst_ip 193.0.0.0/8 action drop



	for i in {0..255}

	do

		for j in {0..255}

		do

			for k in {0..255}

			do

				if [[ $count -eq $route_count ]]; then

					break 3

				fi



				$MZ $h1 -c 1 -p 64 -a $h1mac -b $rp1mac \

					-A 192.0.1.1 -B 193.${i}.${j}.${k} \

					-t ip -q

				((count++))

			done

		done

	done



	tc_check_packets "dev $h2 ingress" 1 $route_count

	check_err $? "Offload mismatch"



	tc filter del dev $h2 ingress protocol ip pref 1 flower \

		skip_sw dst_ip 193.0.0.0/8 action drop



	router_routes_destroy

}

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

+44 −24
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ ALL_TESTS=" 
	devlink_reload_test

"

NUM_NETIFS=2

: ${TIMEOUT:=20000} # ms

source $lib_dir/lib.sh

source $lib_dir/devlink_lib.sh
@@ -360,20 +361,24 @@ vlan_rif_refcount_test() 
	ip link add link br0 name br0.10 up type vlan id 10

	ip -6 address add 2001:db8:1::1/64 dev br0.10



	ip -6 route get fibmatch 2001:db8:1::2 dev br0.10 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev br0.10

	check_err $? "vlan rif was not created before adding port to vlan"



	bridge vlan add vid 10 dev $swp1

	ip -6 route get fibmatch 2001:db8:1::2 dev br0.10 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev br0.10

	check_err $? "vlan rif was destroyed after adding port to vlan"



	bridge vlan del vid 10 dev $swp1

	ip -6 route get fibmatch 2001:db8:1::2 dev br0.10 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev br0.10

	check_err $? "vlan rif was destroyed after removing port from vlan"



	ip link set dev $swp1 nomaster

	ip -6 route get fibmatch 2001:db8:1::2 dev br0.10 | grep -q offload

	check_fail $? "vlan rif was not destroyed after unlinking port from bridge"

	busywait "$TIMEOUT" not wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev br0.10

	check_err $? "vlan rif was not destroyed after unlinking port from bridge"



	log_test "vlan rif refcount"
@@ -401,22 +406,28 @@ subport_rif_refcount_test() 
	ip -6 address add 2001:db8:1::1/64 dev bond1

	ip -6 address add 2001:db8:2::1/64 dev bond1.10



	ip -6 route get fibmatch 2001:db8:1::2 dev bond1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev bond1

	check_err $? "subport rif was not created on lag device"

	ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10

	check_err $? "subport rif was not created on vlan device"



	ip link set dev $swp1 nomaster

	ip -6 route get fibmatch 2001:db8:1::2 dev bond1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev bond1

	check_err $? "subport rif of lag device was destroyed when should not"

	ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10

	check_err $? "subport rif of vlan device was destroyed when should not"



	ip link set dev $swp2 nomaster

	ip -6 route get fibmatch 2001:db8:1::2 dev bond1 | grep -q offload

	check_fail $? "subport rif of lag device was not destroyed when should"

	ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10 | grep -q offload

	check_fail $? "subport rif of vlan device was not destroyed when should"

	busywait "$TIMEOUT" not wait_for_offload \

		ip -6 route get fibmatch 2001:db8:1::2 dev bond1

	check_err $? "subport rif of lag device was not destroyed when should"

	busywait "$TIMEOUT" not wait_for_offload \

		ip -6 route get fibmatch 2001:db8:2::2 dev bond1.10

	check_err $? "subport rif of vlan device was not destroyed when should"



	log_test "subport rif refcount"
@@ -575,7 +586,8 @@ bridge_extern_learn_test() 


	bridge fdb add de:ad:be:ef:13:37 dev $swp1 master extern_learn



	bridge fdb show brport $swp1 | grep de:ad:be:ef:13:37 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		bridge fdb show brport $swp1 de:ad:be:ef:13:37

	check_err $? "fdb entry not marked as offloaded when should"



	log_test "externally learned fdb entry"
@@ -595,9 +607,11 @@ neigh_offload_test() 
	ip -6 neigh add 2001:db8:1::2 lladdr de:ad:be:ef:13:37 nud perm \

		dev $swp1



	ip -4 neigh show dev $swp1 | grep 192.0.2.2 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -4 neigh show dev $swp1 192.0.2.2

	check_err $? "ipv4 neigh entry not marked as offloaded when should"

	ip -6 neigh show dev $swp1 | grep 2001:db8:1::2 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 neigh show dev $swp1 2001:db8:1::2

	check_err $? "ipv6 neigh entry not marked as offloaded when should"



	log_test "neighbour offload indication"
@@ -623,25 +637,31 @@ nexthop_offload_test() 
	ip -6 route add 2001:db8:2::/64 vrf v$swp1 \

		nexthop via 2001:db8:1::2 dev $swp1



	ip -4 route show 198.51.100.0/24 vrf v$swp1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -4 route show 198.51.100.0/24 vrf v$swp1

	check_err $? "ipv4 nexthop not marked as offloaded when should"

	ip -6 route show 2001:db8:2::/64 vrf v$swp1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route show 2001:db8:2::/64 vrf v$swp1

	check_err $? "ipv6 nexthop not marked as offloaded when should"



	ip link set dev $swp2 down

	sleep 1



	ip -4 route show 198.51.100.0/24 vrf v$swp1 | grep -q offload

	check_fail $? "ipv4 nexthop marked as offloaded when should not"

	ip -6 route show 2001:db8:2::/64 vrf v$swp1 | grep -q offload

	check_fail $? "ipv6 nexthop marked as offloaded when should not"

	busywait "$TIMEOUT" not wait_for_offload \

		ip -4 route show 198.51.100.0/24 vrf v$swp1

	check_err $? "ipv4 nexthop marked as offloaded when should not"

	busywait "$TIMEOUT" not wait_for_offload \

		ip -6 route show 2001:db8:2::/64 vrf v$swp1

	check_err $? "ipv6 nexthop marked as offloaded when should not"



	ip link set dev $swp2 up

	setup_wait



	ip -4 route show 198.51.100.0/24 vrf v$swp1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -4 route show 198.51.100.0/24 vrf v$swp1

	check_err $? "ipv4 nexthop not marked as offloaded after neigh add"

	ip -6 route show 2001:db8:2::/64 vrf v$swp1 | grep -q offload

	busywait "$TIMEOUT" wait_for_offload \

		ip -6 route show 2001:db8:2::/64 vrf v$swp1

	check_err $? "ipv6 nexthop not marked as offloaded after neigh add"



	log_test "nexthop offload indication"