Commit 029cc096 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'fix-bridge_vlan_aware-sh-and-bridge_vlan_unaware-sh-with-iff_unicast_flt' 

Vladimir Oltean says:

====================
Fix bridge_vlan_aware.sh and bridge_vlan_unaware.sh with IFF_UNICAST_FLT

Make sure that h1 and h2 don't drop packets with a random MAC DA, which
otherwise confuses these selftests. Also, fix an incorrect error message
found during those failures.
====================

Link: https://lore.kernel.org/r/20220703073626.937785-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 7e8c182c 83844aac

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

+5 −1
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ learning_test() 
	# FDB entry was installed.

	bridge link set dev $br_port1 flood off



	ip link set $host1_if promisc on

	tc qdisc add dev $host1_if ingress

	tc filter add dev $host1_if ingress protocol ip pref 1 handle 101 \

		flower dst_mac $mac action drop
@@ -1250,7 +1251,7 @@ learning_test() 
	tc -j -s filter show dev $host1_if ingress \

		| jq -e ".[] | select(.options.handle == 101) \

		| select(.options.actions[0].stats.packets == 1)" &> /dev/null

	check_fail $? "Packet reached second host when should not"

	check_fail $? "Packet reached first host when should not"



	$MZ $host1_if -c 1 -p 64 -a $mac -t ip -q

	sleep 1
@@ -1289,6 +1290,7 @@ learning_test() 


	tc filter del dev $host1_if ingress protocol ip pref 1 handle 101 flower

	tc qdisc del dev $host1_if ingress

	ip link set $host1_if promisc off



	bridge link set dev $br_port1 flood on
@@ -1306,6 +1308,7 @@ flood_test_do() 


	# Add an ACL on `host2_if` which will tell us whether the packet

	# was flooded to it or not.

	ip link set $host2_if promisc on

	tc qdisc add dev $host2_if ingress

	tc filter add dev $host2_if ingress protocol ip pref 1 handle 101 \

		flower dst_mac $mac action drop
@@ -1323,6 +1326,7 @@ flood_test_do() 


	tc filter del dev $host2_if ingress protocol ip pref 1 handle 101 flower

	tc qdisc del dev $host2_if ingress

	ip link set $host2_if promisc off



	return $err

}