net/mlx5e: Set action fwd flag when parsing tc action goto

Do it when parsing like in other actions instead of when
checking if goto is supported in current scenario.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index d68c67b98d94db1b3fa624eec45f48197bd47a73..3646e88b6401b70613cdddacc1f99cbb4b5cbfe3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3450,7 +3450,8 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
                        if (err)
                                return err;
 
-                       action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;
+                       action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
+                                 MLX5_FLOW_CONTEXT_ACTION_COUNT;
                        attr->dest_chain = act->chain_index;
                        break;
                case FLOW_ACTION_CT:
@@ -3483,12 +3484,9 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv,
 
        attr->action = action;
 
-       if (attr->dest_chain) {
-               if (attr->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
-                       NL_SET_ERR_MSG(extack, "Mirroring goto chain rules isn't supported");
-                       return -EOPNOTSUPP;
-               }
-               attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
+       if (attr->dest_chain && parse_attr->mirred_ifindex[0]) {
+               NL_SET_ERR_MSG(extack, "Mirroring goto chain rules isn't supported");
+               return -EOPNOTSUPP;
        }
 
        if (!actions_match_supported(priv, flow_action, parse_attr, flow, extack))
@@ -3994,7 +3992,8 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                        if (err)
                                return err;
 
-                       action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;
+                       action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
+                                 MLX5_FLOW_CONTEXT_ACTION_COUNT;
                        attr->dest_chain = act->chain_index;
                        break;
                case FLOW_ACTION_CT:
@@ -4064,24 +4063,18 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
        if (!actions_match_supported(priv, flow_action, parse_attr, flow, extack))
                return -EOPNOTSUPP;
 
-       if (attr->dest_chain) {
-               if (decap) {
-                       /* It can be supported if we'll create a mapping for
-                        * the tunnel device only (without tunnel), and set
-                        * this tunnel id with this decap flow.
-                        *
-                        * On restore (miss), we'll just set this saved tunnel
-                        * device.
-                        */
-
-                       NL_SET_ERR_MSG(extack,
-                                      "Decap with goto isn't supported");
-                       netdev_warn(priv->netdev,
-                                   "Decap with goto isn't supported");
-                       return -EOPNOTSUPP;
-               }
+       if (attr->dest_chain && decap) {
+               /* It can be supported if we'll create a mapping for
+                * the tunnel device only (without tunnel), and set
+                * this tunnel id with this decap flow.
+                *
+                * On restore (miss), we'll just set this saved tunnel
+                * device.
+                */
 
-               attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
+               NL_SET_ERR_MSG(extack, "Decap with goto isn't supported");
+               netdev_warn(priv->netdev, "Decap with goto isn't supported");
+               return -EOPNOTSUPP;
        }
 
        if (!(attr->action &