net/mlx5: HWS, update flow - remove the use of dual RTCs

This patch is the first part of update flow implementation.

Update flow should support rules with single STE (match STE only),
as well as rules with multiple STEs (match STE plus action STEs).

Supporting the rules with single STE is straightforward: we just
overwrite the STE, which is an atomic operation.
Supporting the rules with action STEs is a more complicated case.
The existing implementation uses two action RTCs per matcher and
alternates between the two for each update request.
This implementation was unnecessarily complex and lead to some
unhandled edge cases, so the support for rule update with multiple
STEs wasn't really functional.

This patch removes this code, and the next patch adds implementation
of a different approach.

Note that after applying this patch and before applying the next
patch we still have support for update rule with single STE (only
match STE w/o action STEs), but update will fail for rules with
action STEs.

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Vlad Dogaru <vdogaru@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20250109160546.1733647-15-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c
index 60ada3143d60d754473335677857aa3ddd134bfb..696275fd0ce22b83d5f0d289a32ff28d104a3fb7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c
@@ -148,8 +148,8 @@ static int hws_debug_dump_matcher(struct seq_file *f, struct mlx5hws_matcher *ma
                   matcher->match_ste.rtc_1_id,
                   (int)ste_1_id);
 
-       ste = &matcher->action_ste[0].ste;
-       ste_pool = matcher->action_ste[0].pool;
+       ste = &matcher->action_ste.ste;
+       ste_pool = matcher->action_ste.pool;
        if (ste_pool) {
                ste_0_id = mlx5hws_pool_chunk_get_base_id(ste_pool, ste);
                if (tbl_type == MLX5HWS_TABLE_TYPE_FDB)
@@ -171,10 +171,8 @@ static int hws_debug_dump_matcher(struct seq_file *f, struct mlx5hws_matcher *ma
                return ret;
 
        seq_printf(f, ",%d,%d,%d,%d,%d,0x%llx,0x%llx\n",
-                  matcher->action_ste[0].rtc_0_id,
-                  (int)ste_0_id,
-                  matcher->action_ste[0].rtc_1_id,
-                  (int)ste_1_id,
+                  matcher->action_ste.rtc_0_id, (int)ste_0_id,
+                  matcher->action_ste.rtc_1_id, (int)ste_1_id,
                   0,
                   mlx5hws_debug_icm_to_idx(icm_addr_0),
                   mlx5hws_debug_icm_to_idx(icm_addr_1));

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h
index 3c8635f286cef50365e4669d52a06016886efeff..30ccd635b5054ea1fd4e608ce1f7369552f58952 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h
@@ -39,7 +39,6 @@
 #define mlx5hws_dbg(ctx, arg...) mlx5_core_dbg((ctx)->mdev, ##arg)
 
 #define MLX5HWS_TABLE_TYPE_BASE 2
-#define MLX5HWS_ACTION_STE_IDX_ANY 0
 
 static inline bool is_mem_zero(const u8 *mem, size_t size)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
index 4419c72ad3149100c572f4a046aa1dbfa385c677..74a03fbabcf75c7735773166d703b68960ce2e9f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c
@@ -200,7 +200,7 @@ static void hws_matcher_set_rtc_attr_sz(struct mlx5hws_matcher *matcher,
                                        enum mlx5hws_matcher_rtc_type rtc_type,
                                        bool is_mirror)
 {
-       struct mlx5hws_pool_chunk *ste = &matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].ste;
+       struct mlx5hws_pool_chunk *ste = &matcher->action_ste.ste;
        enum mlx5hws_matcher_flow_src flow_src = matcher->attr.optimize_flow_src;
        bool is_match_rtc = rtc_type == HWS_MATCHER_RTC_TYPE_MATCH;
 
@@ -217,8 +217,7 @@ static void hws_matcher_set_rtc_attr_sz(struct mlx5hws_matcher *matcher,
 }
 
 static int hws_matcher_create_rtc(struct mlx5hws_matcher *matcher,
-                                 enum mlx5hws_matcher_rtc_type rtc_type,
-                                 u8 action_ste_selector)
+                                 enum mlx5hws_matcher_rtc_type rtc_type)
 {
        struct mlx5hws_matcher_attr *attr = &matcher->attr;
        struct mlx5hws_cmd_rtc_create_attr rtc_attr = {0};
@@ -278,7 +277,7 @@ static int hws_matcher_create_rtc(struct mlx5hws_matcher *matcher,
                break;
 
        case HWS_MATCHER_RTC_TYPE_STE_ARRAY:
-               action_ste = &matcher->action_ste[action_ste_selector];
+               action_ste = &matcher->action_ste;
 
                rtc_0_id = &action_ste->rtc_0_id;
                rtc_1_id = &action_ste->rtc_1_id;
@@ -350,8 +349,7 @@ free_ste:
 }
 
 static void hws_matcher_destroy_rtc(struct mlx5hws_matcher *matcher,
-                                   enum mlx5hws_matcher_rtc_type rtc_type,
-                                   u8 action_ste_selector)
+                                   enum mlx5hws_matcher_rtc_type rtc_type)
 {
        struct mlx5hws_matcher_action_ste *action_ste;
        struct mlx5hws_table *tbl = matcher->tbl;
@@ -367,7 +365,7 @@ static void hws_matcher_destroy_rtc(struct mlx5hws_matcher *matcher,
                ste = &matcher->match_ste.ste;
                break;
        case HWS_MATCHER_RTC_TYPE_STE_ARRAY:
-               action_ste = &matcher->action_ste[action_ste_selector];
+               action_ste = &matcher->action_ste;
                rtc_0_id = action_ste->rtc_0_id;
                rtc_1_id = action_ste->rtc_1_id;
                ste_pool = action_ste->pool;
@@ -458,20 +456,13 @@ static int hws_matcher_resize_init(struct mlx5hws_matcher *src_matcher)
        if (!resize_data)
                return -ENOMEM;
 
-       resize_data->max_stes = src_matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes;
-
-       resize_data->action_ste[0].stc = src_matcher->action_ste[0].stc;
-       resize_data->action_ste[0].rtc_0_id = src_matcher->action_ste[0].rtc_0_id;
-       resize_data->action_ste[0].rtc_1_id = src_matcher->action_ste[0].rtc_1_id;
-       resize_data->action_ste[0].pool = src_matcher->action_ste[0].max_stes ?
-                                         src_matcher->action_ste[0].pool :
-                                         NULL;
-       resize_data->action_ste[1].stc = src_matcher->action_ste[1].stc;
-       resize_data->action_ste[1].rtc_0_id = src_matcher->action_ste[1].rtc_0_id;
-       resize_data->action_ste[1].rtc_1_id = src_matcher->action_ste[1].rtc_1_id;
-       resize_data->action_ste[1].pool = src_matcher->action_ste[1].max_stes ?
-                                         src_matcher->action_ste[1].pool :
-                                          NULL;
+       resize_data->max_stes = src_matcher->action_ste.max_stes;
+
+       resize_data->stc = src_matcher->action_ste.stc;
+       resize_data->rtc_0_id = src_matcher->action_ste.rtc_0_id;
+       resize_data->rtc_1_id = src_matcher->action_ste.rtc_1_id;
+       resize_data->pool = src_matcher->action_ste.max_stes ?
+                           src_matcher->action_ste.pool : NULL;
 
        /* Place the new resized matcher on the dst matcher's list */
        list_add(&resize_data->list_node, &src_matcher->resize_dst->resize_data);
@@ -504,42 +495,60 @@ static void hws_matcher_resize_uninit(struct mlx5hws_matcher *matcher)
                if (resize_data->max_stes) {
                        mlx5hws_action_free_single_stc(matcher->tbl->ctx,
                                                       matcher->tbl->type,
-                                                      &resize_data->action_ste[1].stc);
-                       mlx5hws_action_free_single_stc(matcher->tbl->ctx,
-                                                      matcher->tbl->type,
-                                                      &resize_data->action_ste[0].stc);
+                                                      &resize_data->stc);
 
-                       if (matcher->tbl->type == MLX5HWS_TABLE_TYPE_FDB) {
+                       if (matcher->tbl->type == MLX5HWS_TABLE_TYPE_FDB)
                                mlx5hws_cmd_rtc_destroy(matcher->tbl->ctx->mdev,
-                                                       resize_data->action_ste[1].rtc_1_id);
-                               mlx5hws_cmd_rtc_destroy(matcher->tbl->ctx->mdev,
-                                                       resize_data->action_ste[0].rtc_1_id);
-                       }
-                       mlx5hws_cmd_rtc_destroy(matcher->tbl->ctx->mdev,
-                                               resize_data->action_ste[1].rtc_0_id);
+                                                       resize_data->rtc_1_id);
+
                        mlx5hws_cmd_rtc_destroy(matcher->tbl->ctx->mdev,
-                                               resize_data->action_ste[0].rtc_0_id);
-                       if (resize_data->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].pool) {
-                               mlx5hws_pool_destroy(resize_data->action_ste[1].pool);
-                               mlx5hws_pool_destroy(resize_data->action_ste[0].pool);
-                       }
+                                               resize_data->rtc_0_id);
+
+                       if (resize_data->pool)
+                               mlx5hws_pool_destroy(resize_data->pool);
                }
 
                kfree(resize_data);
        }
 }
 
-static int
-hws_matcher_bind_at_idx(struct mlx5hws_matcher *matcher, u8 action_ste_selector)
+static int hws_matcher_bind_at(struct mlx5hws_matcher *matcher)
 {
+       bool is_jumbo = mlx5hws_matcher_mt_is_jumbo(matcher->mt);
        struct mlx5hws_cmd_stc_modify_attr stc_attr = {0};
        struct mlx5hws_matcher_action_ste *action_ste;
        struct mlx5hws_table *tbl = matcher->tbl;
        struct mlx5hws_pool_attr pool_attr = {0};
        struct mlx5hws_context *ctx = tbl->ctx;
-       int ret;
+       u32 required_stes;
+       u8 max_stes = 0;
+       int i, ret;
 
-       action_ste = &matcher->action_ste[action_ste_selector];
+       if (matcher->flags & MLX5HWS_MATCHER_FLAGS_COLLISION)
+               return 0;
+
+       for (i = 0; i < matcher->num_of_at; i++) {
+               struct mlx5hws_action_template *at = &matcher->at[i];
+
+               ret = hws_matcher_check_and_process_at(matcher, at);
+               if (ret) {
+                       mlx5hws_err(ctx, "Invalid at %d", i);
+                       return ret;
+               }
+
+               required_stes = at->num_of_action_stes - (!is_jumbo || at->only_term);
+               max_stes = max(max_stes, required_stes);
+
+               /* Future: Optimize reparse */
+       }
+
+       /* There are no additional STEs required for matcher */
+       if (!max_stes)
+               return 0;
+
+       matcher->action_ste.max_stes = max_stes;
+
+       action_ste = &matcher->action_ste;
 
        /* Allocate action STE mempool */
        pool_attr.table_type = tbl->type;
@@ -555,7 +564,7 @@ hws_matcher_bind_at_idx(struct mlx5hws_matcher *matcher, u8 action_ste_selector)
        }
 
        /* Allocate action RTC */
-       ret = hws_matcher_create_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY, action_ste_selector);
+       ret = hws_matcher_create_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY);
        if (ret) {
                mlx5hws_err(ctx, "Failed to create action RTC\n");
                goto free_ste_pool;
@@ -579,18 +588,18 @@ hws_matcher_bind_at_idx(struct mlx5hws_matcher *matcher, u8 action_ste_selector)
        return 0;
 
 free_rtc:
-       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY, action_ste_selector);
+       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY);
 free_ste_pool:
        mlx5hws_pool_destroy(action_ste->pool);
        return ret;
 }
 
-static void hws_matcher_unbind_at_idx(struct mlx5hws_matcher *matcher, u8 action_ste_selector)
+static void hws_matcher_unbind_at(struct mlx5hws_matcher *matcher)
 {
        struct mlx5hws_matcher_action_ste *action_ste;
        struct mlx5hws_table *tbl = matcher->tbl;
 
-       action_ste = &matcher->action_ste[action_ste_selector];
+       action_ste = &matcher->action_ste;
 
        if (!action_ste->max_stes ||
            matcher->flags & MLX5HWS_MATCHER_FLAGS_COLLISION ||
@@ -598,65 +607,10 @@ static void hws_matcher_unbind_at_idx(struct mlx5hws_matcher *matcher, u8 action
                return;
 
        mlx5hws_action_free_single_stc(tbl->ctx, tbl->type, &action_ste->stc);
-       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY, action_ste_selector);
+       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_STE_ARRAY);
        mlx5hws_pool_destroy(action_ste->pool);
 }
 
-static int hws_matcher_bind_at(struct mlx5hws_matcher *matcher)
-{
-       bool is_jumbo = mlx5hws_matcher_mt_is_jumbo(matcher->mt);
-       struct mlx5hws_table *tbl = matcher->tbl;
-       struct mlx5hws_context *ctx = tbl->ctx;
-       u32 required_stes;
-       u8 max_stes = 0;
-       int i, ret;
-
-       if (matcher->flags & MLX5HWS_MATCHER_FLAGS_COLLISION)
-               return 0;
-
-       for (i = 0; i < matcher->num_of_at; i++) {
-               struct mlx5hws_action_template *at = &matcher->at[i];
-
-               ret = hws_matcher_check_and_process_at(matcher, at);
-               if (ret) {
-                       mlx5hws_err(ctx, "Invalid at %d", i);
-                       return ret;
-               }
-
-               required_stes = at->num_of_action_stes - (!is_jumbo || at->only_term);
-               max_stes = max(max_stes, required_stes);
-
-               /* Future: Optimize reparse */
-       }
-
-       /* There are no additional STEs required for matcher */
-       if (!max_stes)
-               return 0;
-
-       matcher->action_ste[0].max_stes = max_stes;
-       matcher->action_ste[1].max_stes = max_stes;
-
-       ret = hws_matcher_bind_at_idx(matcher, 0);
-       if (ret)
-               return ret;
-
-       ret = hws_matcher_bind_at_idx(matcher, 1);
-       if (ret)
-               goto free_at_0;
-
-       return 0;
-
-free_at_0:
-       hws_matcher_unbind_at_idx(matcher, 0);
-       return ret;
-}
-
-static void hws_matcher_unbind_at(struct mlx5hws_matcher *matcher)
-{
-       hws_matcher_unbind_at_idx(matcher, 1);
-       hws_matcher_unbind_at_idx(matcher, 0);
-}
-
 static int hws_matcher_bind_mt(struct mlx5hws_matcher *matcher)
 {
        struct mlx5hws_context *ctx = matcher->tbl->ctx;
@@ -802,7 +756,7 @@ static int hws_matcher_create_and_connect(struct mlx5hws_matcher *matcher)
                goto unbind_at;
 
        /* Allocate the RTC for the new matcher */
-       ret = hws_matcher_create_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH, 0);
+       ret = hws_matcher_create_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH);
        if (ret)
                goto destroy_end_ft;
 
@@ -814,7 +768,7 @@ static int hws_matcher_create_and_connect(struct mlx5hws_matcher *matcher)
        return 0;
 
 destroy_rtc:
-       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH, 0);
+       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH);
 destroy_end_ft:
        hws_matcher_destroy_end_ft(matcher);
 unbind_at:
@@ -828,7 +782,7 @@ static void hws_matcher_destroy_and_disconnect(struct mlx5hws_matcher *matcher)
 {
        hws_matcher_resize_uninit(matcher);
        hws_matcher_disconnect(matcher);
-       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH, 0);
+       hws_matcher_destroy_rtc(matcher, HWS_MATCHER_RTC_TYPE_MATCH);
        hws_matcher_destroy_end_ft(matcher);
        hws_matcher_unbind_at(matcher);
        hws_matcher_unbind_mt(matcher);
@@ -962,10 +916,9 @@ int mlx5hws_matcher_attach_at(struct mlx5hws_matcher *matcher,
                return ret;
 
        required_stes = at->num_of_action_stes - (!is_jumbo || at->only_term);
-       if (matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes < required_stes) {
+       if (matcher->action_ste.max_stes < required_stes) {
                mlx5hws_dbg(ctx, "Required STEs [%d] exceeds initial action template STE [%d]\n",
-                           required_stes,
-                           matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes);
+                           required_stes, matcher->action_ste.max_stes);
                return -ENOMEM;
        }
 
@@ -1149,8 +1102,7 @@ static int hws_matcher_resize_precheck(struct mlx5hws_matcher *src_matcher,
                return -EINVAL;
        }
 
-       if (src_matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes >
-           dst_matcher->action_ste[0].max_stes) {
+       if (src_matcher->action_ste.max_stes > dst_matcher->action_ste.max_stes) {
                mlx5hws_err(ctx, "Src/dst matcher max STEs mismatch\n");
                return -EINVAL;
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h
index 81ff487f57be4ee26a3838f4cd1076c692616637..cff4ae854a795cb380d700f5b4ffc6553ac30ccd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h
@@ -52,15 +52,11 @@ struct mlx5hws_matcher_action_ste {
        u8 max_stes;
 };
 
-struct mlx5hws_matcher_resize_data_node {
+struct mlx5hws_matcher_resize_data {
        struct mlx5hws_pool_chunk stc;
        u32 rtc_0_id;
        u32 rtc_1_id;
        struct mlx5hws_pool *pool;
-};
-
-struct mlx5hws_matcher_resize_data {
-       struct mlx5hws_matcher_resize_data_node action_ste[2];
        u8 max_stes;
        struct list_head list_node;
 };
@@ -78,7 +74,7 @@ struct mlx5hws_matcher {
        struct mlx5hws_matcher *col_matcher;
        struct mlx5hws_matcher *resize_dst;
        struct mlx5hws_matcher_match_ste match_ste;
-       struct mlx5hws_matcher_action_ste action_ste[2];
+       struct mlx5hws_matcher_action_ste action_ste;
        struct list_head list_node;
        struct list_head resize_data;
 };

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
index 14f6307a1772ab10dce3a6af4974c0ccd5f634f9..699a73ed2fd7e931235732f10955ba806e651a32 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c
@@ -142,14 +142,9 @@ hws_rule_save_resize_info(struct mlx5hws_rule *rule,
                        return;
                }
 
-               rule->resize_info->max_stes =
-                       rule->matcher->action_ste[MLX5HWS_ACTION_STE_IDX_ANY].max_stes;
-               rule->resize_info->action_ste_pool[0] = rule->matcher->action_ste[0].max_stes ?
-                                                       rule->matcher->action_ste[0].pool :
-                                                       NULL;
-               rule->resize_info->action_ste_pool[1] = rule->matcher->action_ste[1].max_stes ?
-                                                       rule->matcher->action_ste[1].pool :
-                                                       NULL;
+               rule->resize_info->max_stes = rule->matcher->action_ste.max_stes;
+               rule->resize_info->action_ste_pool = rule->matcher->action_ste.max_stes ?
+                                                    rule->matcher->action_ste.pool : NULL;
        }
 
        memcpy(rule->resize_info->ctrl_seg, ste_attr->wqe_ctrl,
@@ -204,15 +199,15 @@ hws_rule_load_delete_info(struct mlx5hws_rule *rule,
        }
 }
 
-static int hws_rule_alloc_action_ste_idx(struct mlx5hws_rule *rule,
-                                        u8 action_ste_selector)
+static int hws_rule_alloc_action_ste(struct mlx5hws_rule *rule,
+                                    struct mlx5hws_rule_attr *attr)
 {
        struct mlx5hws_matcher *matcher = rule->matcher;
        struct mlx5hws_matcher_action_ste *action_ste;
        struct mlx5hws_pool_chunk ste = {0};
        int ret;
 
-       action_ste = &matcher->action_ste[action_ste_selector];
+       action_ste = &matcher->action_ste;
        ste.order = ilog2(roundup_pow_of_two(action_ste->max_stes));
        ret = mlx5hws_pool_chunk_alloc(action_ste->pool, &ste);
        if (unlikely(ret)) {
@@ -225,8 +220,7 @@ static int hws_rule_alloc_action_ste_idx(struct mlx5hws_rule *rule,
        return 0;
 }
 
-static void hws_rule_free_action_ste_idx(struct mlx5hws_rule *rule,
-                                        u8 action_ste_selector)
+void mlx5hws_rule_free_action_ste(struct mlx5hws_rule *rule)
 {
        struct mlx5hws_matcher *matcher = rule->matcher;
        struct mlx5hws_pool_chunk ste = {0};
@@ -236,10 +230,10 @@ static void hws_rule_free_action_ste_idx(struct mlx5hws_rule *rule,
        if (mlx5hws_matcher_is_resizable(matcher)) {
                /* Free the original action pool if rule was resized */
                max_stes = rule->resize_info->max_stes;
-               pool = rule->resize_info->action_ste_pool[action_ste_selector];
+               pool = rule->resize_info->action_ste_pool;
        } else {
-               max_stes = matcher->action_ste[action_ste_selector].max_stes;
-               pool = matcher->action_ste[action_ste_selector].pool;
+               max_stes = matcher->action_ste.max_stes;
+               pool = matcher->action_ste.pool;
        }
 
        /* This release is safe only when the rule match part was deleted */
@@ -249,41 +243,6 @@ static void hws_rule_free_action_ste_idx(struct mlx5hws_rule *rule,
        mlx5hws_pool_chunk_free(pool, &ste);
 }
 
-static int hws_rule_alloc_action_ste(struct mlx5hws_rule *rule,
-                                    struct mlx5hws_rule_attr *attr)
-{
-       int action_ste_idx;
-       int ret;
-
-       ret = hws_rule_alloc_action_ste_idx(rule, 0);
-       if (unlikely(ret))
-               return ret;
-
-       action_ste_idx = rule->action_ste_idx;
-
-       ret = hws_rule_alloc_action_ste_idx(rule, 1);
-       if (unlikely(ret)) {
-               hws_rule_free_action_ste_idx(rule, 0);
-               return ret;
-       }
-
-       /* Both pools have to return the same index */
-       if (unlikely(rule->action_ste_idx != action_ste_idx)) {
-               pr_warn("HWS: allocation of action STE failed - pool indexes mismatch\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-void mlx5hws_rule_free_action_ste(struct mlx5hws_rule *rule)
-{
-       if (rule->action_ste_idx > -1) {
-               hws_rule_free_action_ste_idx(rule, 1);
-               hws_rule_free_action_ste_idx(rule, 0);
-       }
-}
-
 static void hws_rule_create_init(struct mlx5hws_rule *rule,
                                 struct mlx5hws_send_ste_attr *ste_attr,
                                 struct mlx5hws_actions_apply_data *apply,
@@ -298,9 +257,6 @@ static void hws_rule_create_init(struct mlx5hws_rule *rule,
                /* In update we use these rtc's */
                rule->rtc_0 = 0;
                rule->rtc_1 = 0;
-               rule->action_ste_selector = 0;
-       } else {
-               rule->action_ste_selector = !rule->action_ste_selector;
        }
 
        rule->pending_wqes = 0;
@@ -316,7 +272,7 @@ static void hws_rule_create_init(struct mlx5hws_rule *rule,
        /* Init default action apply */
        apply->tbl_type = tbl->type;
        apply->common_res = &ctx->common_res;
-       apply->jump_to_action_stc = matcher->action_ste[0].stc.offset;
+       apply->jump_to_action_stc = matcher->action_ste.stc.offset;
        apply->require_dep = 0;
 }
 
@@ -333,7 +289,6 @@ static void hws_rule_move_init(struct mlx5hws_rule *rule,
 
        rule->pending_wqes = 0;
        rule->action_ste_idx = -1;
-       rule->action_ste_selector = 0;
        rule->status = MLX5HWS_RULE_STATUS_CREATING;
        rule->resize_info->state = MLX5HWS_RULE_RESIZE_STATE_WRITING;
 }
@@ -403,10 +358,8 @@ static int hws_rule_create_hws(struct mlx5hws_rule *rule,
                        }
                }
                /* Skip RX/TX based on the dep_wqe init */
-               ste_attr.rtc_0 = dep_wqe->rtc_0 ?
-                                matcher->action_ste[rule->action_ste_selector].rtc_0_id : 0;
-               ste_attr.rtc_1 = dep_wqe->rtc_1 ?
-                                matcher->action_ste[rule->action_ste_selector].rtc_1_id : 0;
+               ste_attr.rtc_0 = dep_wqe->rtc_0 ? matcher->action_ste.rtc_0_id : 0;
+               ste_attr.rtc_1 = dep_wqe->rtc_1 ? matcher->action_ste.rtc_1_id : 0;
                /* Action STEs are written to a specific index last to first */
                ste_attr.direct_index = rule->action_ste_idx + action_stes;
                apply.next_direct_idx = ste_attr.direct_index;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h
index 495cdd17e9f3cbe5de26b158e79026ca023f985b..fd2bef87116be1920a1bd2c517b17fa2af093a70 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h
@@ -42,7 +42,7 @@ struct mlx5hws_rule_match_tag {
 };
 
 struct mlx5hws_rule_resize_info {
-       struct mlx5hws_pool *action_ste_pool[2];
+       struct mlx5hws_pool *action_ste_pool;
        u32 rtc_0;
        u32 rtc_1;
        u32 rule_idx;
@@ -62,7 +62,6 @@ struct mlx5hws_rule {
        u32 rtc_1; /* The RTC into which the STE was inserted */
        int action_ste_idx; /* STE array index */
        u8 status; /* enum mlx5hws_rule_status */
-       u8 action_ste_selector; /* For rule update - which action STE is in use */
        u8 pending_wqes;
        bool skip_delete; /* For complex rules - another rule with same tag
                           * still exists, so don't actually delete this rule.