selftests: spectrum-2: Fix multiple_masks_test

With recent fix in C-TCAM spillage for delta masks, the test stops to be
falsely positive. So fix it not to use delta by adding src_ip bits to the
masks. Alongside with that, use C-TCAM spill trace to see when the
spillage actually happens.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
index ed1ae902f2af8c26ac829023e1dafe6d2ee2e6f3..73a35ca827ac3bcaf13a6bc5c61c80b11ad7cdf6 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/tc_flower.sh
@@ -231,20 +231,38 @@ multiple_masks_test()
        # spillage is performed correctly and that the right filter is
        # matched
 
+       if [[ "$tcflags" != "skip_sw" ]]; then
+               return 0;
+       fi
+
        local index
 
        RET=0
 
        NUM_MASKS=32
+       NUM_ERPS=16
        BASE_INDEX=100
 
        for i in $(eval echo {1..$NUM_MASKS}); do
                index=$((BASE_INDEX - i))
 
-               tc filter add dev $h2 ingress protocol ip pref $index \
-                       handle $index \
-                       flower $tcflags dst_ip 192.0.2.2/${i} src_ip 192.0.2.1 \
-                       action drop
+               if ((i > NUM_ERPS)); then
+                       exp_hits=1
+                       err_msg="$i filters - C-TCAM spill did not happen when it was expected"
+               else
+                       exp_hits=0
+                       err_msg="$i filters - C-TCAM spill happened when it should not"
+               fi
+
+               tp_record "mlxsw:mlxsw_sp_acl_atcam_entry_add_ctcam_spill" \
+                       "tc filter add dev $h2 ingress protocol ip pref $index \
+                               handle $index \
+                               flower $tcflags \
+                               dst_ip 192.0.2.2/${i} src_ip 192.0.2.1/${i} \
+                               action drop"
+               tp_check_hits "mlxsw:mlxsw_sp_acl_atcam_entry_add_ctcam_spill" \
+                               $exp_hits
+               check_err $? "$err_msg"
 
                $MZ $h1 -c 1 -p 64 -a $h1mac -b $h2mac -A 192.0.2.1 \
                        -B 192.0.2.2 -t ip -q