net/mlx5e: CT: Use per action stats

CT action can miss in a middle of an action list, use
per action stats to correctly report stats for missed
packets.

Signed-off-by: Paul Blakey <paulb@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
index 8346557eeaf637235a446b2ce862a24e1b72073a..cdcddf6e1b08b663aad9e99b2ce22045a96604c4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
@@ -56,6 +56,8 @@ struct mlx5e_tc_act {
                                   const struct flow_action_entry *act,
                                   struct mlx5_flow_attr *attr);
 
+       bool (*is_missable)(const struct flow_action_entry *act);
+
        int (*offload_action)(struct mlx5e_priv *priv,
                              struct flow_offload_action *fl_act,
                              struct flow_action_entry *act);

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 a829c94289c10fb95587cc45bcb6903e4e3d5465..fce1c0fd245357ed8d5396ee6d929b12774757c2 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
@@ -95,10 +95,17 @@ tc_act_is_multi_table_act_ct(struct mlx5e_priv *priv,
        return true;
 }
 
+static bool
+tc_act_is_missable_ct(const struct flow_action_entry *act)
+{
+       return !(act->ct.action & TCA_CT_ACT_CLEAR);
+}
+
 struct mlx5e_tc_act mlx5e_tc_act_ct = {
        .can_offload = tc_act_can_offload_ct,
        .parse_action = tc_act_parse_ct,
-       .is_multi_table_act = tc_act_is_multi_table_act_ct,
        .post_parse = tc_act_post_parse_ct,
+       .is_multi_table_act = tc_act_is_multi_table_act_ct,
+       .is_missable = tc_act_is_missable_ct,
 };
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index cafab7634fb848d56d19d189314bbaea81ea261b..32b50d68531250fec9cee3dcaf22d5c8c7cd0f01 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -4052,7 +4052,9 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
        enum mlx5_flow_namespace_type ns_type;
        struct mlx5e_priv *priv = flow->priv;
        struct flow_action_entry *act, **_act;
+       struct mlx5_flow_attr *prev_attr;
        struct mlx5e_tc_act *tc_act;
+       bool is_missable;
        int err, i;
 
        flow_action_reorder.num_entries = flow_action->num_entries;
@@ -4069,6 +4071,9 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
        flow_action_for_each(i, _act, &flow_action_reorder) {
                jump_state.jump_target = false;
                act = *_act;
+               is_missable = false;
+               prev_attr = attr;
+
                tc_act = mlx5e_tc_act_get(act->id, ns_type);
                if (!tc_act) {
                        NL_SET_ERR_MSG_MOD(extack, "Not implemented offload action");
@@ -4092,14 +4097,14 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
                        goto out_free;
 
                parse_state->actions |= attr->action;
-               if (!tc_act->stats_action)
-                       attr->tc_act_cookies[attr->tc_act_cookies_count++] = act->cookie;
 
                /* Split attr for multi table act if not the last act. */
                if (jump_state.jump_target ||
                    (tc_act->is_multi_table_act &&
                    tc_act->is_multi_table_act(priv, act, attr) &&
                    i < flow_action_reorder.num_entries - 1)) {
+                       is_missable = tc_act->is_missable ? tc_act->is_missable(act) : false;
+
                        err = mlx5e_tc_act_post_parse(parse_state, flow_action, attr, ns_type);
                        if (err)
                                goto out_free;
@@ -4112,6 +4117,16 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
 
                        list_add(&attr->list, &flow->attrs);
                }
+
+               if (is_missable) {
+                       /* Add counter to prev, and assign act to new (next) attr */
+                       prev_attr->action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;
+                       flow_flag_set(flow, USE_ACT_STATS);
+
+                       attr->tc_act_cookies[attr->tc_act_cookies_count++] = act->cookie;
+               } else if (!tc_act->stats_action) {
+                       prev_attr->tc_act_cookies[prev_attr->tc_act_cookies_count++] = act->cookie;
+               }
        }
 
        kfree(flow_action_reorder.entries);