Every Flow-table has a default miss behavior, meaning what action
to do in case of miss in that Flow-table.
When we are using shared Flow-table we should not use the shared
default instead we should use the default of the local Flow-table
that pointed by the shared Flow-table.
There are two cases that need to be fixed:
When the table created, the default miss should go to the alias ft
that will direct it back to local context.
And also when the rule is without specific hit address and we are
in a shared RTC from here it should be redirected back to the local
context.
Fixes: ce946c7d3999 ("net/mlx5/hws: support ibv context shared with local one")
Cc: sta...@dpdk.org
Signed-off-by: Erez Shitrit <ere...@nvidia.com>
Reviewed-by: Alex Vesker <va...@nvidia.com>
Acked-by: Matan Azrad <ma...@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_action.c | 9 ++++++++-
drivers/net/mlx5/hws/mlx5dr_table.c | 29 ++++++++++++++++++++++------
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c
b/drivers/net/mlx5/hws/mlx5dr_action.c
index 2db62635c1..77cf1f5132 100644
--- a/drivers/net/mlx5/hws/mlx5dr_action.c
+++ b/drivers/net/mlx5/hws/mlx5dr_action.c
@@ -1751,8 +1751,15 @@ int mlx5dr_action_get_default_stc(struct mlx5dr_context
*ctx,
goto free_nop_dw6;
}
- stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_ALLOW;
stc_attr.action_offset = MLX5DR_ACTION_OFFSET_HIT;
+ if (!mlx5dr_context_shared_gvmi_used(ctx)) {
+ stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_ALLOW;
+ } else {
+ /* On shared gvmi the default hit behavior is jump to alias end
ft */
+ stc_attr.action_type = MLX5_IFC_STC_ACTION_TYPE_JUMP_TO_FT;
+ stc_attr.dest_table_id =
ctx->gvmi_res[tbl_type].aliased_end_ft->id;
+ }
+
ret = mlx5dr_action_alloc_single_stc(ctx, &stc_attr, tbl_type,
&default_stc->default_hit);
if (ret) {
diff --git a/drivers/net/mlx5/hws/mlx5dr_table.c
b/drivers/net/mlx5/hws/mlx5dr_table.c
index 327e2ec710..0e5e9b49ab 100644
--- a/drivers/net/mlx5/hws/mlx5dr_table.c
+++ b/drivers/net/mlx5/hws/mlx5dr_table.c
@@ -272,6 +272,9 @@ static void mlx5dr_table_uninit_shared_ctx_res(struct
mlx5dr_table *tbl)
/* called under spin_lock ctx->ctrl_lock */
static int mlx5dr_table_init_shared_ctx_res(struct mlx5dr_context *ctx, struct
mlx5dr_table *tbl)
{
+ struct mlx5dr_cmd_ft_modify_attr ft_attr = {0};
+ int ret;
+
if (!mlx5dr_context_shared_gvmi_used(ctx))
return 0;
@@ -288,8 +291,22 @@ static int mlx5dr_table_init_shared_ctx_res(struct
mlx5dr_context *ctx, struct m
goto clean_local_ft;
}
+ /* On shared gvmi the default behavior is jump to alias end ft */
+ mlx5dr_cmd_set_attr_connect_miss_tbl(tbl->ctx,
+ tbl->fw_ft_type,
+ tbl->type,
+ &ft_attr);
+
+ ret = mlx5dr_cmd_flow_table_modify(tbl->ft, &ft_attr);
+ if (ret) {
+ DR_LOG(ERR, "Failed to point table to its default miss");
+ goto clean_shared_res;
+ }
+
return 0;
+clean_shared_res:
+ mlx5dr_table_put_shared_gvmi_res(tbl);
clean_local_ft:
mlx5dr_table_destroy_default_ft(tbl, tbl->local_ft);
return rte_errno;
@@ -337,20 +354,20 @@ static int mlx5dr_table_init(struct mlx5dr_table *tbl)
return rte_errno;
}
- ret = mlx5dr_action_get_default_stc(ctx, tbl->type);
+ ret = mlx5dr_table_init_shared_ctx_res(ctx, tbl);
if (ret)
goto tbl_destroy;
- ret = mlx5dr_table_init_shared_ctx_res(ctx, tbl);
+ ret = mlx5dr_action_get_default_stc(ctx, tbl->type);
if (ret)
- goto put_stc;
+ goto free_shared_ctx;
pthread_spin_unlock(&ctx->ctrl_lock);
return 0;
-put_stc:
- mlx5dr_action_put_default_stc(ctx, tbl->type);
+free_shared_ctx:
+ mlx5dr_table_uninit_shared_ctx_res(tbl);
tbl_destroy:
mlx5dr_table_destroy_default_ft(tbl, tbl->ft);
pthread_spin_unlock(&ctx->ctrl_lock);
@@ -363,8 +380,8 @@ static void mlx5dr_table_uninit(struct mlx5dr_table *tbl)
return;
pthread_spin_lock(&tbl->ctx->ctrl_lock);
mlx5dr_action_put_default_stc(tbl->ctx, tbl->type);
- mlx5dr_table_destroy_default_ft(tbl, tbl->ft);
mlx5dr_table_uninit_shared_ctx_res(tbl);
+ mlx5dr_table_destroy_default_ft(tbl, tbl->ft);
pthread_spin_unlock(&tbl->ctx->ctrl_lock);
}
--
2.18.2
