af0a51113c
In commit6de6e46d27("cls_flower: Fix inability to match GRE/IPIP packets"), cls_flower was fixed to match an outer packet of a tunneled packet as would be expected, rather than dissecting to the inner packet and matching on that. This fix uncovered several issues in packet matching in mirroring selftests: - in mirror_gre_bridge_1d_vlan.sh and mirror_gre_vlan_bridge_1q.sh, the vlan_ethtype match is copied around as "ip", even as some of the tests are running over ip6gretap. This is fixed by using an "ipv6" for vlan_ethtype in the ip6gretap tests. - in mirror_gre_changes.sh, a filter to count GRE packets is set up to match TTL of 50. This used to trigger in the offloaded datapath, where the envelope TTL was matched, but not in the software datapath, which considered TTL of the inner packet. Now that both match consistently, all the packets were double-counted. This is fixed by marking the filter as skip_hw, leaving only the SW datapath component active. Fixes:6de6e46d27("cls_flower: Fix inability to match GRE/IPIP packets") Signed-off-by: Petr Machata <petrm@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
150 lines
2.9 KiB
Bash
150 lines
2.9 KiB
Bash
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
mirror_install()
|
|
{
|
|
local from_dev=$1; shift
|
|
local direction=$1; shift
|
|
local to_dev=$1; shift
|
|
local filter=$1; shift
|
|
|
|
tc filter add dev $from_dev $direction \
|
|
pref 1000 $filter \
|
|
action mirred egress mirror dev $to_dev
|
|
}
|
|
|
|
mirror_uninstall()
|
|
{
|
|
local from_dev=$1; shift
|
|
local direction=$1; shift
|
|
|
|
tc filter del dev $swp1 $direction pref 1000
|
|
}
|
|
|
|
is_ipv6()
|
|
{
|
|
local addr=$1; shift
|
|
|
|
[[ -z ${addr//[0-9a-fA-F:]/} ]]
|
|
}
|
|
|
|
mirror_test()
|
|
{
|
|
local vrf_name=$1; shift
|
|
local sip=$1; shift
|
|
local dip=$1; shift
|
|
local dev=$1; shift
|
|
local pref=$1; shift
|
|
local expect=$1; shift
|
|
|
|
if is_ipv6 $dip; then
|
|
local proto=-6
|
|
local type="icmp6 type=128" # Echo request.
|
|
else
|
|
local proto=
|
|
local type="icmp echoreq"
|
|
fi
|
|
|
|
local t0=$(tc_rule_stats_get $dev $pref)
|
|
$MZ $proto $vrf_name ${sip:+-A $sip} -B $dip -a own -b bc -q \
|
|
-c 10 -d 100msec -t $type
|
|
sleep 0.5
|
|
local t1=$(tc_rule_stats_get $dev $pref)
|
|
local delta=$((t1 - t0))
|
|
# Tolerate a couple stray extra packets.
|
|
((expect <= delta && delta <= expect + 2))
|
|
check_err $? "Expected to capture $expect packets, got $delta."
|
|
}
|
|
|
|
do_test_span_dir_ips()
|
|
{
|
|
local expect=$1; shift
|
|
local dev=$1; shift
|
|
local direction=$1; shift
|
|
local ip1=$1; shift
|
|
local ip2=$1; shift
|
|
|
|
icmp_capture_install $dev
|
|
mirror_test v$h1 $ip1 $ip2 $dev 100 $expect
|
|
mirror_test v$h2 $ip2 $ip1 $dev 100 $expect
|
|
icmp_capture_uninstall $dev
|
|
}
|
|
|
|
quick_test_span_dir_ips()
|
|
{
|
|
do_test_span_dir_ips 10 "$@"
|
|
}
|
|
|
|
fail_test_span_dir_ips()
|
|
{
|
|
do_test_span_dir_ips 0 "$@"
|
|
}
|
|
|
|
test_span_dir_ips()
|
|
{
|
|
local dev=$1; shift
|
|
local direction=$1; shift
|
|
local forward_type=$1; shift
|
|
local backward_type=$1; shift
|
|
local ip1=$1; shift
|
|
local ip2=$1; shift
|
|
|
|
quick_test_span_dir_ips "$dev" "$direction" "$ip1" "$ip2"
|
|
|
|
icmp_capture_install $dev "type $forward_type"
|
|
mirror_test v$h1 $ip1 $ip2 $dev 100 10
|
|
icmp_capture_uninstall $dev
|
|
|
|
icmp_capture_install $dev "type $backward_type"
|
|
mirror_test v$h2 $ip2 $ip1 $dev 100 10
|
|
icmp_capture_uninstall $dev
|
|
}
|
|
|
|
fail_test_span_dir()
|
|
{
|
|
fail_test_span_dir_ips "$@" 192.0.2.1 192.0.2.2
|
|
}
|
|
|
|
test_span_dir()
|
|
{
|
|
test_span_dir_ips "$@" 192.0.2.1 192.0.2.2
|
|
}
|
|
|
|
do_test_span_vlan_dir_ips()
|
|
{
|
|
local expect=$1; shift
|
|
local dev=$1; shift
|
|
local vid=$1; shift
|
|
local direction=$1; shift
|
|
local ul_proto=$1; shift
|
|
local ip1=$1; shift
|
|
local ip2=$1; shift
|
|
|
|
# Install the capture as skip_hw to avoid double-counting of packets.
|
|
# The traffic is meant for local box anyway, so will be trapped to
|
|
# kernel.
|
|
vlan_capture_install $dev "skip_hw vlan_id $vid vlan_ethtype $ul_proto"
|
|
mirror_test v$h1 $ip1 $ip2 $dev 100 $expect
|
|
mirror_test v$h2 $ip2 $ip1 $dev 100 $expect
|
|
vlan_capture_uninstall $dev
|
|
}
|
|
|
|
quick_test_span_vlan_dir_ips()
|
|
{
|
|
do_test_span_vlan_dir_ips 10 "$@"
|
|
}
|
|
|
|
fail_test_span_vlan_dir_ips()
|
|
{
|
|
do_test_span_vlan_dir_ips 0 "$@"
|
|
}
|
|
|
|
quick_test_span_vlan_dir()
|
|
{
|
|
quick_test_span_vlan_dir_ips "$@" 192.0.2.1 192.0.2.2
|
|
}
|
|
|
|
fail_test_span_vlan_dir()
|
|
{
|
|
fail_test_span_vlan_dir_ips "$@" 192.0.2.1 192.0.2.2
|
|
}
|