Commit 8e059d64 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

selftests: mlxsw: vxlan: Make the test more flexible for future use 



vxlan.sh cases are dedicated to test VxLAN with IPv4 underlay.
The main changes to test IPv6 underlay are IP addresses and some flags.

Add variables to define all the values which supposed to be different
for IPv6 testing, set them to use the existing values by default.

The next patch will define the new added variables in a separated file,
so the same tests can be used for IPv6 also.

Rename some functions to include "ipv4", so the next patch will add
equivalent functions for IPv6.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30be4551

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

+125 −99
Original line number Diff line number Diff line
@@ -4,10 +4,35 @@ 
# Test various aspects of VxLAN offloading which are specific to mlxsw, such

# as sanitization of invalid configurations and offload indication.



lib_dir=$(dirname $0)/../../../net/forwarding

: ${ADDR_FAMILY:=ipv4}

export ADDR_FAMILY



: ${LOCAL_IP_1:=198.51.100.1}

export LOCAL_IP_1



: ${LOCAL_IP_2:=198.51.100.2}

export LOCAL_IP_2



: ${PREFIX_LEN:=32}

export PREFIX_LEN



: ${UDPCSUM_FLAFS:=noudpcsum}

export UDPCSUM_FLAFS



ALL_TESTS="sanitization_test offload_indication_test \

	sanitization_vlan_aware_test offload_indication_vlan_aware_test"

: ${MC_IP:=239.0.0.1}

export MC_IP



: ${IP_FLAG:=""}

export IP_FLAG



: ${ALL_TESTS:="

	sanitization_test

	offload_indication_test

	sanitization_vlan_aware_test

	offload_indication_vlan_aware_test

"}



lib_dir=$(dirname $0)/../../../net/forwarding

NUM_NETIFS=2

: ${TIMEOUT:=20000} # ms

source $lib_dir/lib.sh
@@ -63,8 +88,8 @@ sanitization_single_dev_valid_test() 


	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_pass
@@ -80,8 +105,8 @@ sanitization_single_dev_vlan_aware_test() 


	ip link add dev br0 type bridge mcast_snooping 0 vlan_filtering 1



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_pass
@@ -97,8 +122,8 @@ sanitization_single_dev_mcast_enabled_test() 


	ip link add dev br0 type bridge



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_fail
@@ -115,9 +140,9 @@ sanitization_single_dev_mcast_group_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add name dummy1 up type dummy



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789 \

		dev dummy1 group 239.0.0.1

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789 \

		dev dummy1 group $MC_IP



	sanitization_single_dev_test_fail
@@ -134,7 +159,7 @@ sanitization_single_dev_no_local_ip_test() 


	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit dstport 4789



	sanitization_single_dev_test_fail
@@ -145,14 +170,14 @@ sanitization_single_dev_no_local_ip_test() 
	log_test "vxlan device with no local ip"

}



sanitization_single_dev_learning_enabled_test()

sanitization_single_dev_learning_enabled_ipv4_test()

{

	RET=0



	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 learning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 learning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_pass
@@ -169,8 +194,8 @@ sanitization_single_dev_local_interface_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add name dummy1 up type dummy



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789 dev dummy1

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789 dev dummy1



	sanitization_single_dev_test_fail
@@ -187,8 +212,8 @@ sanitization_single_dev_port_range_test() 


	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789 \

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789 \

		srcport 4000 5000



	sanitization_single_dev_test_fail
@@ -205,8 +230,8 @@ sanitization_single_dev_tos_static_test() 


	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos 20 local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos 20 local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_fail
@@ -222,8 +247,8 @@ sanitization_single_dev_ttl_inherit_test() 


	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl inherit tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl inherit tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_fail
@@ -233,14 +258,14 @@ sanitization_single_dev_ttl_inherit_test() 
	log_test "vxlan device with inherit ttl"

}



sanitization_single_dev_udp_checksum_test()

sanitization_single_dev_udp_checksum_ipv4_test()

{

	RET=0



	ip link add dev br0 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning udpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_single_dev_test_fail
@@ -259,12 +284,12 @@ sanitization_single_dev_test() 
	sanitization_single_dev_mcast_enabled_test

	sanitization_single_dev_mcast_group_test

	sanitization_single_dev_no_local_ip_test

	sanitization_single_dev_learning_enabled_test

	sanitization_single_dev_learning_enabled_"$ADDR_FAMILY"_test

	sanitization_single_dev_local_interface_test

	sanitization_single_dev_port_range_test

	sanitization_single_dev_tos_static_test

	sanitization_single_dev_ttl_inherit_test

	sanitization_single_dev_udp_checksum_test

	sanitization_single_dev_udp_checksum_"$ADDR_FAMILY"_test

}



sanitization_multi_devs_test_pass()
@@ -316,10 +341,10 @@ sanitization_multi_devs_valid_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add dev br1 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_multi_devs_test_pass
@@ -338,10 +363,10 @@ sanitization_multi_devs_ttl_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add dev br1 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning noudpcsum \

		ttl 40 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning $UDPCSUM_FLAFS \

		ttl 40 tos inherit local $LOCAL_IP_1 dstport 4789



	sanitization_multi_devs_test_fail
@@ -360,10 +385,10 @@ sanitization_multi_devs_udp_dstport_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add dev br1 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 5789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 5789



	sanitization_multi_devs_test_fail
@@ -382,10 +407,10 @@ sanitization_multi_devs_local_ip_test() 
	ip link add dev br0 type bridge mcast_snooping 0

	ip link add dev br1 type bridge mcast_snooping 0



	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.2 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up type vxlan id 20 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_2 dstport 4789



	sanitization_multi_devs_test_fail
@@ -425,12 +450,12 @@ offload_indication_setup_create() 
	ip link set dev $swp1 master br0

	ip link set dev $swp2 master br1



	ip address add 198.51.100.1/32 dev lo

	ip address add $LOCAL_IP_1/$PREFIX_LEN dev lo



	ip link add name vxlan0 up master br0 type vxlan id 10 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up master br1 type vxlan id 20 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

}



offload_indication_setup_destroy()
@@ -438,7 +463,7 @@ offload_indication_setup_destroy() 
	ip link del dev vxlan1

	ip link del dev vxlan0



	ip address del 198.51.100.1/32 dev lo

	ip address del $LOCAL_IP_1/$PREFIX_LEN dev lo



	ip link set dev $swp2 nomaster

	ip link set dev $swp1 nomaster
@@ -451,7 +476,7 @@ offload_indication_fdb_flood_test() 
{

	RET=0



	bridge fdb append 00:00:00:00:00:00 dev vxlan0 self dst 198.51.100.2

	bridge fdb append 00:00:00:00:00:00 dev vxlan0 self dst $LOCAL_IP_2



	busywait "$TIMEOUT" wait_for_offload grep_bridge_fdb 00:00:00:00:00:00 \

		bridge fdb show brport vxlan0
@@ -467,7 +492,7 @@ offload_indication_fdb_bridge_test() 
	RET=0



	bridge fdb add de:ad:be:ef:13:37 dev vxlan0 self master static \

		dst 198.51.100.2

		dst $LOCAL_IP_2



	busywait "$TIMEOUT" wait_for_offload grep_bridge_fdb \

		de:ad:be:ef:13:37 self bridge fdb show brport vxlan0
@@ -518,7 +543,7 @@ offload_indication_fdb_bridge_test() 
	# marked as offloaded in both drivers

	RET=0



	bridge fdb add de:ad:be:ef:13:37 dev vxlan0 self dst 198.51.100.2

	bridge fdb add de:ad:be:ef:13:37 dev vxlan0 self dst $LOCAL_IP_2

	busywait "$TIMEOUT" wait_for_offload grep_bridge_fdb \

		de:ad:be:ef:13:37 self bridge fdb show brport vxlan0

	check_err $?
@@ -542,17 +567,17 @@ offload_indication_decap_route_test() 
	RET=0



	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link set dev vxlan0 down

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link set dev vxlan1 down

	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - vxlan device down"
@@ -561,26 +586,26 @@ offload_indication_decap_route_test() 


	ip link set dev vxlan1 up

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link set dev vxlan0 up

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - vxlan device up"



	RET=0



	ip address delete 198.51.100.1/32 dev lo

	ip address delete $LOCAL_IP_1/$PREFIX_LEN dev lo

	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip address add 198.51.100.1/32 dev lo

	ip address add $LOCAL_IP_1/$PREFIX_LEN dev lo

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - add local route"
@@ -589,18 +614,18 @@ offload_indication_decap_route_test() 


	ip link set dev $swp1 nomaster

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link set dev $swp2 nomaster

	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link set dev $swp1 master br0

	ip link set dev $swp2 master br1

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - local ports enslavement"
@@ -609,12 +634,12 @@ offload_indication_decap_route_test() 


	ip link del dev br0

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link del dev br1

	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - bridge device deletion"
@@ -628,25 +653,25 @@ offload_indication_decap_route_test() 
	ip link set dev vxlan0 master br0

	ip link set dev vxlan1 master br1

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link del dev vxlan0

	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	ip link del dev vxlan1

	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - vxlan device deletion"



	ip link add name vxlan0 up master br0 type vxlan id 10 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan1 up master br1 type vxlan id 20 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

}



check_fdb_offloaded()
@@ -703,10 +728,10 @@ __offload_indication_join_vxlan_first() 
	local mac=00:11:22:33:44:55

	local zmac=00:00:00:00:00:00



	bridge fdb append $zmac dev vxlan0 self dst 198.51.100.2

	bridge fdb append $zmac dev vxlan0 self dst $LOCAL_IP_2



	ip link set dev vxlan0 master br0

	bridge fdb add dev vxlan0 $mac self master static dst 198.51.100.2

	bridge fdb add dev vxlan0 $mac self master static dst $LOCAL_IP_2



	RET=0

	check_vxlan_fdb_not_offloaded
@@ -756,8 +781,8 @@ __offload_indication_join_vxlan_first() 
offload_indication_join_vxlan_first()

{

	ip link add dev br0 up type bridge mcast_snooping 0

	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	__offload_indication_join_vxlan_first
@@ -771,7 +796,7 @@ __offload_indication_join_vxlan_last() 


	RET=0



	bridge fdb append $zmac dev vxlan0 self dst 198.51.100.2

	bridge fdb append $zmac dev vxlan0 self dst $LOCAL_IP_2



	ip link set dev $swp1 master br0
@@ -791,8 +816,8 @@ __offload_indication_join_vxlan_last() 
offload_indication_join_vxlan_last()

{

	ip link add dev br0 up type bridge mcast_snooping 0

	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	__offload_indication_join_vxlan_last
@@ -819,10 +844,10 @@ sanitization_vlan_aware_test() 
	ip link add dev br0 type bridge mcast_snooping 0 vlan_filtering 1



	ip link add name vxlan10 up master br0 type vxlan id 10 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	ip link add name vxlan20 up master br0 type vxlan id 20 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	# Test that when each VNI is mapped to a different VLAN we can enslave

	# a port to the bridge
@@ -866,20 +891,20 @@ sanitization_vlan_aware_test() 


	# Use the offload indication of the local route to ensure the VXLAN

	# configuration was correctly rollbacked.

	ip address add 198.51.100.1/32 dev lo

	ip address add $LOCAL_IP_1/$PREFIX_LEN dev lo



	ip link set dev vxlan10 type vxlan ttl 10

	ip link set dev $swp1 master br0 &> /dev/null

	check_fail $?



	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	log_test "vlan-aware - failed enslavement to bridge due to conflict"



	ip link set dev vxlan10 type vxlan ttl 20

	ip address del 198.51.100.1/32 dev lo

	ip address del $LOCAL_IP_1/$PREFIX_LEN dev lo



	ip link del dev vxlan20

	ip link del dev vxlan10
@@ -898,12 +923,12 @@ offload_indication_vlan_aware_setup_create() 
	bridge vlan add vid 10 dev $swp1

	bridge vlan add vid 20 dev $swp1



	ip address add 198.51.100.1/32 dev lo

	ip address add $LOCAL_IP_1/$PREFIX_LEN dev lo



	ip link add name vxlan10 up master br0 type vxlan id 10 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789

	ip link add name vxlan20 up master br0 type vxlan id 20 nolearning \

		noudpcsum ttl 20 tos inherit local 198.51.100.1 dstport 4789

		$UDPCSUM_FLAFS ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	bridge vlan add vid 10 dev vxlan10 pvid untagged

	bridge vlan add vid 20 dev vxlan20 pvid untagged
@@ -917,7 +942,7 @@ offload_indication_vlan_aware_setup_destroy() 
	ip link del dev vxlan20

	ip link del dev vxlan10



	ip address del 198.51.100.1/32 dev lo

	ip address del $LOCAL_IP_1/$PREFIX_LEN dev lo



	bridge vlan del vid 20 dev $swp1

	bridge vlan del vid 10 dev $swp1
@@ -934,7 +959,7 @@ offload_indication_vlan_aware_fdb_test() 
	log_info "vxlan entry offload indication - vlan-aware"



	bridge fdb add de:ad:be:ef:13:37 dev vxlan10 self master static \

		dst 198.51.100.2 vlan 10

		dst $LOCAL_IP_2 vlan 10



	busywait "$TIMEOUT" wait_for_offload grep_bridge_fdb \

		de:ad:be:ef:13:37 self bridge fdb show brport vxlan10
@@ -985,7 +1010,7 @@ offload_indication_vlan_aware_fdb_test() 
	# marked as offloaded in both drivers

	RET=0



	bridge fdb add de:ad:be:ef:13:37 dev vxlan10 self dst 198.51.100.2

	bridge fdb add de:ad:be:ef:13:37 dev vxlan10 self dst $LOCAL_IP_2

	busywait "$TIMEOUT" wait_for_offload grep_bridge_fdb \

		de:ad:be:ef:13:37 self bridge fdb show brport vxlan10

	check_err $?
@@ -1003,7 +1028,7 @@ offload_indication_vlan_aware_decap_route_test() 
	RET=0



	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	# Toggle PVID flag on one VxLAN device and make sure route is still
@@ -1011,7 +1036,7 @@ offload_indication_vlan_aware_decap_route_test() 
	bridge vlan add vid 10 dev vxlan10 untagged



	busywait "$TIMEOUT" wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	# Toggle PVID flag on second VxLAN device and make sure route is no
@@ -1019,14 +1044,15 @@ offload_indication_vlan_aware_decap_route_test() 
	bridge vlan add vid 20 dev vxlan20 untagged



	busywait "$TIMEOUT" not wait_for_offload \

		ip route show table local 198.51.100.1

		ip $IP_FLAG route show table local $LOCAL_IP_1

	check_err $?



	# Toggle PVID flag back and make sure route is marked as offloaded

	bridge vlan add vid 10 dev vxlan10 pvid untagged

	bridge vlan add vid 20 dev vxlan20 pvid untagged



	busywait "$TIMEOUT" wait_for_offload ip route show table local 198.51.100.1

	busywait "$TIMEOUT" wait_for_offload ip $IP_FLAG route show table local \

		$LOCAL_IP_1

	check_err $?



	log_test "vxlan decap route - vni map/unmap"
@@ -1036,8 +1062,8 @@ offload_indication_vlan_aware_join_vxlan_first() 
{

	ip link add dev br0 up type bridge mcast_snooping 0 \

		vlan_filtering 1 vlan_default_pvid 1

	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	__offload_indication_join_vxlan_first 1
@@ -1049,8 +1075,8 @@ offload_indication_vlan_aware_join_vxlan_last() 
{

	ip link add dev br0 up type bridge mcast_snooping 0 \

		vlan_filtering 1 vlan_default_pvid 1

	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	__offload_indication_join_vxlan_last
@@ -1067,14 +1093,14 @@ offload_indication_vlan_aware_l3vni_test() 
	sysctl_set net.ipv6.conf.default.disable_ipv6 1

	ip link add dev br0 up type bridge mcast_snooping 0 \

		vlan_filtering 1 vlan_default_pvid 0

	ip link add name vxlan0 up type vxlan id 10 nolearning noudpcsum \

		ttl 20 tos inherit local 198.51.100.1 dstport 4789

	ip link add name vxlan0 up type vxlan id 10 nolearning $UDPCSUM_FLAFS \

		ttl 20 tos inherit local $LOCAL_IP_1 dstport 4789



	ip link set dev $swp1 master br0



	# The test will use the offload indication on the FDB entry to

	# understand if the tunnel is offloaded or not

	bridge fdb append $zmac dev vxlan0 self dst 192.0.2.1

	bridge fdb append $zmac dev vxlan0 self dst $LOCAL_IP_2



	ip link set dev vxlan0 master br0

	bridge vlan add dev vxlan0 vid 10 pvid untagged