selftests: forwarding: Tweak tc filters for mirror-to-gretap tests

[ Upstream commit ec9fdc99f5a6a2cfe4061e807fcb0cc1129f0a2d ]

When running mirror_gre_bridge_1d_vlan tests on veth, several issues
cause spurious failures:

- vlan_ethtype should be ip, not ipv6 even in mirror-to-ip6gretap case,
  because the overlay packet is still IPv4.
- Similarly ip_proto matches the innermost IP protocol, so can't be used
  to filter out GRE packet. Drop the corresponding condition.
- Because the above fixes the filters to match in slow path as well,
  they need to be made skip_hw so as not to double-count packets.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh
index 3bb4c2b..197e769 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh
@@ -74,12 +74,14 @@ test_vlan_match()
 
 test_gretap()
 {
-       test_vlan_match gt4 'vlan_id 555 vlan_ethtype ip' "mirror to gretap"
+       test_vlan_match gt4 'skip_hw vlan_id 555 vlan_ethtype ip' \
+                       "mirror to gretap"
 }
 
 test_ip6gretap()
 {
-       test_vlan_match gt6 'vlan_id 555 vlan_ethtype ipv6' "mirror to ip6gretap"
+       test_vlan_match gt6 'skip_hw vlan_id 555 vlan_ethtype ip' \
+                       "mirror to ip6gretap"
 }
 
 test_gretap_stp()

diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh
index 619b469..1c18e33 100644 (file)
--- a/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_gre_lib.sh
@@ -62,7 +62,7 @@ full_test_span_gre_dir_vlan_ips()
                          "$backward_type" "$ip1" "$ip2"
 
        tc filter add dev $h3 ingress pref 77 prot 802.1q \
-               flower $vlan_match ip_proto 0x2f \
+               flower $vlan_match \
                action pass
        mirror_test v$h1 $ip1 $ip2 $h3 77 10
        tc filter del dev $h3 ingress pref 77

diff --git a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh
index 5dbc7a0..a122747 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh
+++ b/tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh
@@ -79,12 +79,14 @@ test_vlan_match()
 
 test_gretap()
 {
-       test_vlan_match gt4 'vlan_id 555 vlan_ethtype ip' "mirror to gretap"
+       test_vlan_match gt4 'skip_hw vlan_id 555 vlan_ethtype ip' \
+                       "mirror to gretap"
 }
 
 test_ip6gretap()
 {
-       test_vlan_match gt6 'vlan_id 555 vlan_ethtype ipv6' "mirror to ip6gretap"
+       test_vlan_match gt6 'skip_hw vlan_id 555 vlan_ethtype ip' \
+                       "mirror to ip6gretap"
 }
 
 test_span_gre_forbidden_cpu()