net/mlx5e: Test CT and SAMPLE on flow attr

Currently the mlx5_flow object contains a single mlx5_attr instance.
However, multi table actions (e.g. CT) instantiate multiple attr instances.
Prepare for multiple attr instances by testing for CT or SAMPLE flag on attr
flags instead of flow flag.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Chris Mi <cmi@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
index e8ff9493368835b841f10d59eb18a6b509857beb..85f0cb88127fadcbd18b2e9cba4346ac1f3cf6d5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c
@@ -48,6 +48,7 @@ tc_act_parse_ct(struct mlx5e_tc_act_parse_state *parse_state,
                attr->esw_attr->split_count = attr->esw_attr->out_count;
 
        if (!clear_action) {
+               attr->flags |= MLX5_ATTR_FLAG_CT;
                flow_flag_set(parse_state->flow, CT);
                parse_state->ct = true;
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c
index 8f261204fdb49c4df26d36a67706208527c93646..539fea13ce9f4fe10a6219ded5dc2fd43132aeb7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c
@@ -36,6 +36,7 @@ tc_act_parse_sample(struct mlx5e_tc_act_parse_state *parse_state,
        if (act->sample.truncate)
                sample_attr->trunc_size = act->sample.trunc_size;
 
+       attr->flags |= MLX5_ATTR_FLAG_SAMPLE;
        flow_flag_set(parse_state->flow, SAMPLE);
 
        return 0;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
index 31b4e39be2d3703a6549f66211cf669e412bc18d..9e0e229cf164b7afeb9a8b0bb898e2108ac5349b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c
@@ -101,6 +101,7 @@ mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *at
        post_attr->inner_match_level = MLX5_MATCH_NONE;
        post_attr->outer_match_level = MLX5_MATCH_NONE;
        post_attr->action &= ~(MLX5_FLOW_CONTEXT_ACTION_DECAP);
+       post_attr->flags &= ~MLX5_ATTR_FLAG_SAMPLE;
 
        handle->ns_type = post_act->ns_type;
        /* Splits were handled before post action */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
index 375763f1561a34613b330537174b4268f5e55b6f..e13619133d53f6cf1e52996d743a4260ea2e754f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
@@ -112,6 +112,17 @@ struct mlx5e_tc_flow {
        struct mlx5_flow_attr *attr;
 };
 
+struct mlx5_flow_handle *
+mlx5e_tc_rule_offload(struct mlx5e_priv *priv,
+                     struct mlx5e_tc_flow *flow,
+                     struct mlx5_flow_spec *spec,
+                     struct mlx5_flow_attr *attr);
+
+void
+mlx5e_tc_rule_unoffload(struct mlx5e_priv *priv,
+                       struct mlx5e_tc_flow *flow,
+                       struct mlx5_flow_attr *attr);
+
 u8 mlx5e_tc_get_ip_version(struct mlx5_flow_spec *spec, bool outer);
 
 struct mlx5_flow_handle *
@@ -174,6 +185,7 @@ struct mlx5_flow_handle *
 mlx5e_tc_offload_to_slow_path(struct mlx5_eswitch *esw,
                              struct mlx5e_tc_flow *flow,
                              struct mlx5_flow_spec *spec);
+
 void mlx5e_tc_unoffload_fdb_rules(struct mlx5_eswitch *esw,
                                  struct mlx5e_tc_flow *flow,
                                  struct mlx5_flow_attr *attr);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index d37a5f752b1cadb4b62dfb408cbf6c127d53c6ca..31fdc819287958654d4cfa448704174488c5e8fb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -295,13 +295,65 @@ mlx5_tc_rule_delete(struct mlx5e_priv *priv,
 
        if (is_mdev_switchdev_mode(priv->mdev)) {
                mlx5_eswitch_del_offloaded_rule(esw, rule, attr);
-
                return;
        }
 
        mlx5e_del_offloaded_nic_rule(priv, rule, attr);
 }
 
+struct mlx5_flow_handle *
+mlx5e_tc_rule_offload(struct mlx5e_priv *priv,
+                     struct mlx5e_tc_flow *flow,
+                     struct mlx5_flow_spec *spec,
+                     struct mlx5_flow_attr *attr)
+{
+       struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+       u32 tun_id = mlx5e_tc_get_flow_tun_id(flow);
+
+       if (attr->flags & MLX5_ATTR_FLAG_CT) {
+               struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts =
+                       &attr->parse_attr->mod_hdr_acts;
+
+               return mlx5_tc_ct_flow_offload(get_ct_priv(priv), flow,
+                                              spec, attr,
+                                              mod_hdr_acts);
+       }
+
+       if (!is_mdev_switchdev_mode(priv->mdev))
+               return mlx5e_add_offloaded_nic_rule(priv, spec, attr);
+
+       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE)
+               return mlx5e_tc_sample_offload(get_sample_priv(priv), spec, attr, tun_id);
+
+       return mlx5_eswitch_add_offloaded_rule(esw, spec, attr);
+}
+
+void
+mlx5e_tc_rule_unoffload(struct mlx5e_priv *priv,
+                       struct mlx5e_tc_flow *flow,
+                       struct mlx5_flow_attr *attr)
+{
+       struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+       struct mlx5_flow_handle *rule = flow->rule[0];
+
+       if (attr->flags & MLX5_ATTR_FLAG_CT) {
+               mlx5_tc_ct_delete_flow(get_ct_priv(priv), flow, attr);
+               return;
+       }
+
+       if (!is_mdev_switchdev_mode(priv->mdev)) {
+               mlx5e_del_offloaded_nic_rule(priv, rule, attr);
+               return;
+       }
+
+       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE) {
+               mlx5e_tc_sample_unoffload(get_sample_priv(priv), rule, attr);
+               return;
+       }
+
+       mlx5_eswitch_del_offloaded_rule(esw, rule, attr);
+}
+
 int
 mlx5e_tc_match_to_reg_set(struct mlx5_core_dev *mdev,
                          struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts,
@@ -1084,7 +1136,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv,
                        return err;
        }
 
-       if (flow_flag_test(flow, CT))
+       if (attr->flags & MLX5_ATTR_FLAG_CT)
                flow->rule[0] = mlx5_tc_ct_flow_offload(get_ct_priv(priv), flow, &parse_attr->spec,
                                                        attr, &parse_attr->mod_hdr_acts);
        else
@@ -1119,7 +1171,7 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv,
 
        flow_flag_clear(flow, OFFLOADED);
 
-       if (flow_flag_test(flow, CT))
+       if (attr->flags & MLX5_ATTR_FLAG_CT)
                mlx5_tc_ct_delete_flow(get_ct_priv(flow->priv), flow, attr);
        else if (!IS_ERR_OR_NULL(flow->rule[0]))
                mlx5e_del_offloaded_nic_rule(priv, flow->rule[0], attr);
@@ -1154,40 +1206,27 @@ mlx5e_tc_offload_fdb_rules(struct mlx5_eswitch *esw,
                           struct mlx5_flow_spec *spec,
                           struct mlx5_flow_attr *attr)
 {
-       struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts;
        struct mlx5_flow_handle *rule;
 
        if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)
                return mlx5_eswitch_add_offloaded_rule(esw, spec, attr);
 
-       if (flow_flag_test(flow, CT)) {
-               mod_hdr_acts = &attr->parse_attr->mod_hdr_acts;
-
-               rule = mlx5_tc_ct_flow_offload(get_ct_priv(flow->priv),
-                                              flow, spec, attr,
-                                              mod_hdr_acts);
-       } else if (flow_flag_test(flow, SAMPLE)) {
-               rule = mlx5e_tc_sample_offload(get_sample_priv(flow->priv), spec, attr,
-                                              mlx5e_tc_get_flow_tun_id(flow));
-       } else {
-               rule = mlx5_eswitch_add_offloaded_rule(esw, spec, attr);
-       }
+       rule = mlx5e_tc_rule_offload(flow->priv, flow, spec, attr);
 
        if (IS_ERR(rule))
                return rule;
 
        if (attr->esw_attr->split_count) {
                flow->rule[1] = mlx5_eswitch_add_fwd_rule(esw, spec, attr);
-               if (IS_ERR(flow->rule[1])) {
-                       if (flow_flag_test(flow, CT))
-                               mlx5_tc_ct_delete_flow(get_ct_priv(flow->priv), flow, attr);
-                       else
-                               mlx5_eswitch_del_offloaded_rule(esw, rule, attr);
-                       return flow->rule[1];
-               }
+               if (IS_ERR(flow->rule[1]))
+                       goto err_rule1;
        }
 
        return rule;
+
+err_rule1:
+       mlx5e_tc_rule_unoffload(flow->priv, flow, attr);
+       return flow->rule[1];
 }
 
 void mlx5e_tc_unoffload_fdb_rules(struct mlx5_eswitch *esw,
@@ -1197,18 +1236,12 @@ void mlx5e_tc_unoffload_fdb_rules(struct mlx5_eswitch *esw,
        flow_flag_clear(flow, OFFLOADED);
 
        if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)
-               goto offload_rule_0;
+               return mlx5_eswitch_del_offloaded_rule(esw, flow->rule[0], attr);
 
        if (attr->esw_attr->split_count)
                mlx5_eswitch_del_fwd_rule(esw, flow->rule[1], attr);
 
-       if (flow_flag_test(flow, CT))
-               mlx5_tc_ct_delete_flow(get_ct_priv(flow->priv), flow, attr);
-       else if (flow_flag_test(flow, SAMPLE))
-               mlx5e_tc_sample_unoffload(get_sample_priv(flow->priv), flow->rule[0], attr);
-       else
-offload_rule_0:
-               mlx5_eswitch_del_offloaded_rule(esw, flow->rule[0], attr);
+       mlx5e_tc_rule_unoffload(flow->priv, flow, attr);
 }
 
 struct mlx5_flow_handle *

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index 277515916526670fa794cf3cb52433af1cbae998..722702be7e914755bae778156027fd017a9a5f17 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -96,6 +96,7 @@ enum {
        MLX5_ATTR_FLAG_SRC_REWRITE   = BIT(3),
        MLX5_ATTR_FLAG_SAMPLE        = BIT(4),
        MLX5_ATTR_FLAG_ACCEPT        = BIT(5),
+       MLX5_ATTR_FLAG_CT            = BIT(6),
 };
 
 /* Returns true if any of the flags that require skipping further TC/NF processing are set. */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 133f5cf23c3f6c7cd07a27ea3b8ac6b4194435c0..2b31d8bbd1b82782c84bdca56cf78808e533c90c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -465,7 +465,8 @@ esw_setup_dests(struct mlx5_flow_destination *dest,
            esw_src_port_rewrite_supported(esw))
                attr->flags |= MLX5_ATTR_FLAG_SRC_REWRITE;
 
-       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE) {
+       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE &&
+           !(attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)) {
                esw_setup_sampler_dest(dest, flow_act, attr->sample_attr.sampler_id, *i);
                (*i)++;
        } else if (attr->dest_ft) {