d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix flow tag hash list conversion

Browse Source 
When DR is not supported and DV is supported, tag action still can be
used by the metadata feature.

Wrongly, the tag hash list was not created what caused failure in
metadata action creation.

Create the tag hash list for each DV case.

Fixes: 860897d2895a ("net/mlx5: reorganize flow tables with hash list")

Signed-off-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Matan Azrad 2019-11-21 11:27:57 +00:00 committed by Ferruh Yigit
parent 2286291df1
commit 1ef4cdef26
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/mlx5/mlx5.c
View File

@ -866,13 +866,21 @@ error:
static int static int
mlx5_alloc_shared_dr(struct mlx5_priv *priv) mlx5_alloc_shared_dr(struct mlx5_priv *priv)
{ {
struct mlx5_ibv_shared *sh = priv->sh;
char s[MLX5_HLIST_NAMESIZE];
int err = mlx5_alloc_table_hash_list(priv); int err = mlx5_alloc_table_hash_list(priv);
if (err) if (err)
return err; return err;
/* Create tags hash list table. */
snprintf(s, sizeof(s), "%s_tags", sh->ibdev_name);
sh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE);
if (!sh->tag_table) {
DRV_LOG(ERR, "tags with hash creation failed.\n");
err = ENOMEM;
goto error;
}
#ifdef HAVE_MLX5DV_DR #ifdef HAVE_MLX5DV_DR
struct mlx5_ibv_shared *sh = priv->sh;
char s[MLX5_HLIST_NAMESIZE];
void *domain; void *domain;
if (sh->dv_refcnt) { if (sh->dv_refcnt) {
@ -912,20 +920,13 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop(); sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
} }
#endif #endif
/* create tags hash list table. */
snprintf(s, sizeof(s), "%s_tags", priv->sh->ibdev_name);
sh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE);
if (!sh->flow_tbls) {
DRV_LOG(ERR, "tags with hash creation failed.\n");
goto error;
}
sh->pop_vlan_action = mlx5_glue->dr_create_flow_action_pop_vlan(); sh->pop_vlan_action = mlx5_glue->dr_create_flow_action_pop_vlan();
#endif /* HAVE_MLX5DV_DR */
sh->dv_refcnt++; sh->dv_refcnt++;
priv->dr_shared = 1; priv->dr_shared = 1;
return 0; return 0;
error: error:
/* Rollback the created objects. */ /* Rollback the created objects. */
if (sh->rx_domain) { if (sh->rx_domain) {
mlx5_glue->dr_destroy_domain(sh->rx_domain); mlx5_glue->dr_destroy_domain(sh->rx_domain);
sh->rx_domain = NULL; sh->rx_domain = NULL;
@ -946,8 +947,12 @@ error:
mlx5_glue->destroy_flow_action(sh->pop_vlan_action); mlx5_glue->destroy_flow_action(sh->pop_vlan_action);
sh->pop_vlan_action = NULL; sh->pop_vlan_action = NULL;
} }
if (sh->tag_table) {
/* tags should be destroyed with flow before. */
mlx5_hlist_destroy(sh->tag_table, NULL, NULL);
sh->tag_table = NULL;
}
mlx5_free_table_hash_list(priv); mlx5_free_table_hash_list(priv);
#endif
return err; return err;
} }
@ -960,7 +965,6 @@ error:
static void static void
mlx5_free_shared_dr(struct mlx5_priv *priv) mlx5_free_shared_dr(struct mlx5_priv *priv)
{ {
#ifdef HAVE_MLX5DV_DR
struct mlx5_ibv_shared *sh; struct mlx5_ibv_shared *sh;
if (!priv->dr_shared) if (!priv->dr_shared)
@ -968,6 +972,7 @@ mlx5_free_shared_dr(struct mlx5_priv *priv)
priv->dr_shared = 0; priv->dr_shared = 0;
sh = priv->sh; sh = priv->sh;
assert(sh); assert(sh);
#ifdef HAVE_MLX5DV_DR
assert(sh->dv_refcnt); assert(sh->dv_refcnt);
if (sh->dv_refcnt && --sh->dv_refcnt) if (sh->dv_refcnt && --sh->dv_refcnt)
return; return;
@ -989,17 +994,17 @@ mlx5_free_shared_dr(struct mlx5_priv *priv)
sh->esw_drop_action = NULL; sh->esw_drop_action = NULL;
} }
#endif #endif
if (sh->tag_table) {
/* tags should be destroyed with flow before. */
mlx5_hlist_destroy(sh->tag_table, NULL, NULL);
sh->tag_table = NULL;
}
if (sh->pop_vlan_action) { if (sh->pop_vlan_action) {
mlx5_glue->destroy_flow_action(sh->pop_vlan_action); mlx5_glue->destroy_flow_action(sh->pop_vlan_action);
sh->pop_vlan_action = NULL; sh->pop_vlan_action = NULL;
} }
pthread_mutex_destroy(&sh->dv_mutex); pthread_mutex_destroy(&sh->dv_mutex);
#endif /* HAVE_MLX5DV_DR */ #endif /* HAVE_MLX5DV_DR */
if (sh->tag_table) {
/* tags should be destroyed with flow before. */
mlx5_hlist_destroy(sh->tag_table, NULL, NULL);
sh->tag_table = NULL;
}
mlx5_free_table_hash_list(priv); mlx5_free_table_hash_list(priv);
} }