selftests: router_bridge_pvid_vlan_upper: Add a new selftest

This tests whether addition and deletion of a VLAN upper that coincides
with the current PVID setting throws off forwarding.

This selftests is specifically geared towards offloading drivers. In
particular, mlxsw used to fail this selftest, and an earlier patch in this
patchset fixes the issue. However, there's nothing HW-specific in the test
itself (it absolutely is supposed to pass on SW datapath), and therefore it
is put into the generic forwarding directory.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/net/forwarding/Makefile b/tools/testing/selftests/net/forwarding/Makefile
index 1a21990..2d8bb72 100644 (file)
--- a/tools/testing/selftests/net/forwarding/Makefile
+++ b/tools/testing/selftests/net/forwarding/Makefile
@@ -65,6 +65,7 @@ TEST_PROGS = bridge_igmp.sh \
        q_in_vni.sh \
        router_bridge.sh \
        router_bridge_vlan.sh \
+       router_bridge_pvid_vlan_upper.sh \
        router_bridge_vlan_upper_pvid.sh \
        router_broadcast.sh \
        router_mpath_nh_res.sh \

diff --git a/tools/testing/selftests/net/forwarding/router_bridge_pvid_vlan_upper.sh b/tools/testing/selftests/net/forwarding/router_bridge_pvid_vlan_upper.sh
new file mode 100755 (executable)
index 0000000..76e4941
--- /dev/null
+++ b/tools/testing/selftests/net/forwarding/router_bridge_pvid_vlan_upper.sh
@@ -0,0 +1,155 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+# +----------------------------+
+# |                   H1 (vrf) |
+# |   + $h1.10                 |                      +----------------------+
+# |   | 192.0.2.1/28           |                      |             H2 (vrf) |
+# |   | 2001:db8:1::1/64       |                      |  + $h2               |
+# |   |                        |                      |  | 192.0.2.130/28    |
+# |   + $h1                    |                      |  | 2001:db8:2::2/64  |
+# +---|------------------------+                      +--|-------------------+
+#     |                                                  |
+# +---|--------------------------------------------------|-------------------+
+# |   |                            router (main VRF)     |                   |
+# | +-|----------------------------------+               + $swp2             |
+# | | + $swp1      BR1 (802.1q, pvid=10) |                 192.0.2.129/28    |
+# | |              192.0.2.2/28          |                 2001:db8:2::1/64  |
+# | |              2001:db8:1::2/64      |                                   |
+# | +------------------------------------+                                   |
+# +--------------------------------------------------------------------------+
+
+ALL_TESTS="
+       ping_ipv4
+       ping_ipv6
+       shuffle_pvid
+       ping_ipv4
+       ping_ipv6
+"
+NUM_NETIFS=4
+source lib.sh
+
+h1_create()
+{
+       simple_if_init $h1
+       vlan_create $h1 10 v$h1 192.0.2.1/28 2001:db8:1::1/64
+       ip -4 route add 192.0.2.128/28 vrf v$h1 nexthop via 192.0.2.2
+       ip -6 route add 2001:db8:2::/64 vrf v$h1 nexthop via 2001:db8:1::2
+}
+
+h1_destroy()
+{
+       ip -6 route del 2001:db8:2::/64 vrf v$h1
+       ip -4 route del 192.0.2.128/28 vrf v$h1
+       vlan_destroy $h1 10
+       simple_if_fini $h1
+}
+
+h2_create()
+{
+       simple_if_init $h2 192.0.2.130/28 2001:db8:2::2/64
+       ip -4 route add 192.0.2.0/28 vrf v$h2 nexthop via 192.0.2.129
+       ip -6 route add 2001:db8:1::/64 vrf v$h2 nexthop via 2001:db8:2::1
+}
+
+h2_destroy()
+{
+       ip -6 route del 2001:db8:1::/64 vrf v$h2
+       ip -4 route del 192.0.2.0/28 vrf v$h2
+       simple_if_fini $h2 192.0.2.130/28 2001:db8:2::2/64
+}
+
+router_create()
+{
+       ip link add name br1 address $(mac_get $swp1) \
+               type bridge vlan_filtering 1 vlan_default_pvid 0
+       ip link set dev br1 up
+       __addr_add_del br1 add 192.0.2.2/28 2001:db8:1::2/64
+
+       ip link set dev $swp1 master br1
+       ip link set dev $swp1 up
+
+       ip link set dev $swp2 up
+       __addr_add_del $swp2 add 192.0.2.129/28 2001:db8:2::1/64
+
+       bridge vlan add dev br1 vid 10 pvid untagged self
+       bridge vlan add dev $swp1 vid 10
+}
+
+router_destroy()
+{
+       bridge vlan del dev $swp1 vid 10
+       bridge vlan del dev br1 vid 10 self
+
+       __addr_add_del $swp2 del 192.0.2.129/28 2001:db8:2::1/64
+       ip link set dev $swp2 down
+
+       ip link set dev $swp1 down
+       ip link set dev $swp1 nomaster
+
+       __addr_add_del br1 del 192.0.2.2/28 2001:db8:1::2/64
+       ip link del dev br1
+}
+
+setup_prepare()
+{
+       h1=${NETIFS[p1]}
+       swp1=${NETIFS[p2]}
+
+       swp2=${NETIFS[p3]}
+       h2=${NETIFS[p4]}
+
+       vrf_prepare
+
+       h1_create
+       h2_create
+
+       router_create
+
+       forwarding_enable
+}
+
+shuffle_pvid()
+{
+       log_info "Add and remove VLAN upper for PVID VLAN"
+
+       # Adding and removing a VLAN upper for the PVID VLAN shouldn't change
+       # anything. The address is arbitrary, just to make sure it will be an L3
+       # netdevice.
+       vlan_create br1 10 "" 192.0.2.33/28
+       sleep 1
+       vlan_destroy br1 10
+}
+
+cleanup()
+{
+       pre_cleanup
+
+       forwarding_restore
+
+       router_destroy
+
+       h2_destroy
+       h1_destroy
+
+       vrf_cleanup
+}
+
+ping_ipv4()
+{
+       ping_test $h1 192.0.2.130
+}
+
+ping_ipv6()
+{
+       ping6_test $h1 2001:db8:2::2
+}
+
+trap cleanup EXIT
+
+setup_prepare
+setup_wait
+
+tests_run
+
+exit $EXIT_STATUS