Commit 9c1d3511 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed

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: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarMaor Dickman <maord@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent d9581e2f
...@@ -3169,19 +3169,41 @@ static bool modify_header_match_supported(struct mlx5e_priv *priv, ...@@ -3169,19 +3169,41 @@ static bool modify_header_match_supported(struct mlx5e_priv *priv,
return true; return true;
} }
static bool actions_match_supported(struct mlx5e_priv *priv, static bool
struct flow_action *flow_action, actions_match_supported_fdb(struct mlx5e_priv *priv,
struct mlx5e_tc_flow_parse_attr *parse_attr, struct mlx5e_tc_flow_parse_attr *parse_attr,
struct mlx5e_tc_flow *flow, struct mlx5e_tc_flow *flow,
struct netlink_ext_ack *extack) 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 = flow->attr->action;
u32 actions; bool ct_flow, ct_clear;
ct_clear = flow->attr->ct_attr.ct_action & ct_clear = flow->attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR;
TCA_CT_ACT_CLEAR;
ct_flow = flow_flag_test(flow, CT) && !ct_clear; ct_flow = flow_flag_test(flow, CT) && !ct_clear;
actions = flow->attr->action;
if (!(actions & if (!(actions &
(MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_DROP))) { (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_DROP))) {
...@@ -3189,23 +3211,14 @@ static bool actions_match_supported(struct mlx5e_priv *priv, ...@@ -3189,23 +3211,14 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
return false; return false;
} }
if (mlx5e_is_eswitch_flow(flow)) { if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
if (flow->attr->esw_attr->split_count && ct_flow && !modify_header_match_supported(priv, &parse_attr->spec, flow_action,
!MLX5_CAP_GEN(flow->attr->esw_attr->in_mdev, reg_c_preserve)) { actions, ct_flow, ct_clear, extack))
/* All registers used by ct are cleared when using return false;
* 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) if (mlx5e_is_eswitch_flow(flow) &&
return modify_header_match_supported(priv, &parse_attr->spec, !actions_match_supported_fdb(priv, parse_attr, flow, extack))
flow_action, actions, return false;
ct_flow, ct_clear,
extack);
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment