net/mlx5e: Rely on filter_dev instead of dissector keys for tunnels

Currently, tunnel attributes are parsed and inner header matching is used
only when flow dissector specifies match on some of the supported
encapsulation fields. When user tries to offload tc filter that doesn't
match any encapsulation fields on tunnel device, mlx5 tc layer incorrectly
sets to match packet header keys on encap header (outer header) and
firmware rejects the rule with syndrome 0x7e1579 when creating new flow
group.

Change __parse_cls_flower() to determine whether tunnel is used based on
fitler_dev tunnel info, instead of determining it indirectly by checking
flow dissector enc keys.

Fixes: bbd00f7e2349 ("net/mlx5e: Add TC tunnel release action for SRIOV offloads")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Reviewed-by: Roi Dayan <roid@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 018709a4343fe4a07d3763dce54803d4db05314c..b95e0ae4d7fda1bc8441adfcddab029ecfde5882 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1522,11 +1522,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
                return -EOPNOTSUPP;
        }
 
-       if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS) ||
-           flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS) ||
-           flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID) ||
-           flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_PORTS) ||
-           flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_OPTS)) {
+       if (mlx5e_get_tc_tun(filter_dev)) {
                if (parse_tunnel_attr(priv, spec, f, filter_dev, tunnel_match_level))
                        return -EOPNOTSUPP;