net/mlx5e: Fix rejecting all egress rules not on vlan
authorRoi Dayan <roid@mellanox.com>
Tue, 3 Mar 2020 09:18:53 +0000 (11:18 +0200)
committerSaeed Mahameed <saeedm@mellanox.com>
Wed, 18 Mar 2020 02:41:28 +0000 (19:41 -0700)
The original condition rejected all egress rules that
are not on tunnel device.
Also, the whole point of this egress reject was to disallow bad
rules because of egdev which doesn't exists today, so remove
this check entirely.

Fixes: 0a7fcb78cc21 ("net/mlx5e: Support inner header rewrite with goto action")
Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
Reviewed-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index a2ff7df67b46d6bbea9ed39a9046a07e66dc9d36..db1aee1d48e394bfc1b287ff05d420d96baa223c 100644 (file)
@@ -3044,8 +3044,7 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
                                    struct mlx5e_tc_flow *flow,
                                    struct netlink_ext_ack *extack)
 {
-       struct net_device *filter_dev = parse_attr->filter_dev;
-       bool drop_action, pop_action, ct_flow;
+       bool ct_flow;
        u32 actions;
 
        ct_flow = flow_flag_test(flow, CT);
@@ -3064,18 +3063,6 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
                actions = flow->nic_attr->action;
        }
 
-       drop_action = actions & MLX5_FLOW_CONTEXT_ACTION_DROP;
-       pop_action = actions & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP;
-
-       if (flow_flag_test(flow, EGRESS) && !drop_action) {
-               /* We only support filters on tunnel device, or on vlan
-                * devices if they have pop/drop action
-                */
-               if (!mlx5e_get_tc_tun(filter_dev) ||
-                   (is_vlan_dev(filter_dev) && !pop_action))
-                       return false;
-       }
-
        if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
                return modify_header_match_supported(&parse_attr->spec,
                                                     flow_action, actions,