net/mlx5e: Split actions_match_supported() into a sub function

There will probably be more checks, some for nic flows, some for fdb
flows and some are shared checks. Split it for fdb and nic to avoid
the function getting too big.

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 f39589fdd48f55ffad41816c9ef3a9aa51d89615..24b0c0e3c5735a8837356ddb048a6ee6f59697e6 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3169,19 +3169,41 @@ out_ok:
        return true;
 }
 
-static bool actions_match_supported(struct mlx5e_priv *priv,
-                                   struct flow_action *flow_action,
-                                   struct mlx5e_tc_flow_parse_attr *parse_attr,
-                                   struct mlx5e_tc_flow *flow,
-                                   struct netlink_ext_ack *extack)
+static bool
+actions_match_supported_fdb(struct mlx5e_priv *priv,
+                           struct mlx5e_tc_flow_parse_attr *parse_attr,
+                           struct mlx5e_tc_flow *flow,
+                           struct netlink_ext_ack *extack)
+{
+       bool ct_flow, ct_clear;
+
+       ct_clear = flow->attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR;
+       ct_flow = flow_flag_test(flow, CT) && !ct_clear;
+
+       if (flow->attr->esw_attr->split_count && ct_flow &&
+           !MLX5_CAP_GEN(flow->attr->esw_attr->in_mdev, reg_c_preserve)) {
+               /* All registers used by ct are cleared when using
+                * split rules.
+                */
+               NL_SET_ERR_MSG_MOD(extack, "Can't offload mirroring with action ct");
+               return false;
+       }
+
+       return true;
+}
+
+static bool
+actions_match_supported(struct mlx5e_priv *priv,
+                       struct flow_action *flow_action,
+                       struct mlx5e_tc_flow_parse_attr *parse_attr,
+                       struct mlx5e_tc_flow *flow,
+                       struct netlink_ext_ack *extack)
 {
-       bool ct_flow = false, ct_clear = false;
-       u32 actions;
+       u32 actions = flow->attr->action;
+       bool ct_flow, ct_clear;
 
-       ct_clear = flow->attr->ct_attr.ct_action &
-               TCA_CT_ACT_CLEAR;
+       ct_clear = flow->attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR;
        ct_flow = flow_flag_test(flow, CT) && !ct_clear;
-       actions = flow->attr->action;
 
        if (!(actions &
              (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_DROP))) {
@@ -3189,23 +3211,14 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
                return false;
        }
 
-       if (mlx5e_is_eswitch_flow(flow)) {
-               if (flow->attr->esw_attr->split_count && ct_flow &&
-                   !MLX5_CAP_GEN(flow->attr->esw_attr->in_mdev, reg_c_preserve)) {
-                       /* All registers used by ct are cleared when using
-                        * split rules.
-                        */
-                       NL_SET_ERR_MSG_MOD(extack,
-                                          "Can't offload mirroring with action ct");
-                       return false;
-               }
-       }
+       if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
+           !modify_header_match_supported(priv, &parse_attr->spec, flow_action,
+                                          actions, ct_flow, ct_clear, extack))
+               return false;
 
-       if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR)
-               return modify_header_match_supported(priv, &parse_attr->spec,
-                                                    flow_action, actions,
-                                                    ct_flow, ct_clear,
-                                                    extack);
+       if (mlx5e_is_eswitch_flow(flow) &&
+           !actions_match_supported_fdb(priv, parse_attr, flow, extack))
+               return false;
 
        return true;
 }