net/mlx5: Add modify FTE helper function

Add modify FTE helper function and use it when deleting a rule, as a
pre-step towards consolidated FTE modification, with no functional
change.

Signed-off-by: Eli Britstein <elibr@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index 86f9863..5ff8c5f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -420,22 +420,37 @@ static void del_sw_flow_table(struct fs_node *node)
        kfree(ft);
 }
 
-static void del_sw_hw_rule(struct fs_node *node)
+static void modify_fte(struct fs_fte *fte)
 {
        struct mlx5_flow_root_namespace *root;
-       struct mlx5_flow_rule *rule;
        struct mlx5_flow_table *ft;
        struct mlx5_flow_group *fg;
-       struct fs_fte *fte;
-       int modify_mask;
-       struct mlx5_core_dev *dev = get_dev(node);
+       struct mlx5_core_dev *dev;
        int err;
-       bool update_fte = false;
 
-       fs_get_obj(rule, node);
-       fs_get_obj(fte, rule->node.parent);
+       if (!fte->modify_mask)
+               return;
+
        fs_get_obj(fg, fte->node.parent);
        fs_get_obj(ft, fg->node.parent);
+       dev = get_dev(&fte->node);
+
+       root = find_root(&ft->node);
+       err = root->cmds->update_fte(dev, ft, fg->id, fte->modify_mask, fte);
+       if (err)
+               mlx5_core_warn(dev,
+                              "%s can't del rule fg id=%d fte_index=%d\n",
+                              __func__, fg->id, fte->index);
+       fte->modify_mask = 0;
+}
+
+static void del_sw_hw_rule(struct fs_node *node)
+{
+       struct mlx5_flow_rule *rule;
+       struct fs_fte *fte;
+
+       fs_get_obj(rule, node);
+       fs_get_obj(fte, rule->node.parent);
        trace_mlx5_fs_del_rule(rule);
        if (rule->sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
                mutex_lock(&rule->dest_attr.ft->lock);
@@ -445,27 +460,20 @@ static void del_sw_hw_rule(struct fs_node *node)
 
        if (rule->dest_attr.type == MLX5_FLOW_DESTINATION_TYPE_COUNTER  &&
            --fte->dests_size) {
-               modify_mask = BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_ACTION) |
-                             BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_FLOW_COUNTERS);
+               fte->modify_mask |=
+                       BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_ACTION) |
+                       BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_FLOW_COUNTERS);
                fte->action.action &= ~MLX5_FLOW_CONTEXT_ACTION_COUNT;
-               update_fte = true;
                goto out;
        }
 
        if ((fte->action.action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
            --fte->dests_size) {
-               modify_mask = BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_DESTINATION_LIST);
-               update_fte = true;
+               fte->modify_mask |=
+                       BIT(MLX5_SET_FTE_MODIFY_ENABLE_MASK_DESTINATION_LIST);
        }
 out:
-       root = find_root(&ft->node);
-       if (update_fte && fte->dests_size) {
-               err = root->cmds->update_fte(dev, ft, fg->id, modify_mask, fte);
-               if (err)
-                       mlx5_core_warn(dev,
-                                      "%s can't del rule fg id=%d fte_index=%d\n",
-                                      __func__, fg->id, fte->index);
-       }
+       modify_fte(fte);
        kfree(rule);
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index 2dc8634..87de0e4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -172,6 +172,7 @@ struct fs_fte {
        enum fs_fte_status              status;
        struct mlx5_fc                  *counter;
        struct rhash_head               hash;
+       int                             modify_mask;
 };
 
 /* Type of children is mlx5_flow_table/namespace */