net/mlx5: make header reformat action thread safe

[dpdk.git] / drivers / net / mlx5 / linux / mlx5_os.c

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index ae735a3..d017c23 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -225,7 +225,7 @@ static int
 mlx5_alloc_shared_dr(struct mlx5_priv *priv)
 {
        struct mlx5_dev_ctx_shared *sh = priv->sh;
-       char s[MLX5_HLIST_NAMESIZE];
+       char s[MLX5_HLIST_NAMESIZE] __rte_unused;
        int err;
 
        MLX5_ASSERT(sh && sh->refcnt);
@@ -233,30 +233,49 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
                return 0;
        err = mlx5_alloc_table_hash_list(priv);
        if (err)
-               return err;
+               goto error;
+       /* The resources below are only valid with DV support. */
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
        /* 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);
+       sh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE, 0,
+                                         MLX5_HLIST_WRITE_MOST,
+                                         flow_dv_tag_create_cb, NULL,
+                                         flow_dv_tag_remove_cb);
        if (!sh->tag_table) {
                DRV_LOG(ERR, "tags with hash creation failed.");
                err = ENOMEM;
                goto error;
        }
+       sh->tag_table->ctx = sh;
        snprintf(s, sizeof(s), "%s_hdr_modify", sh->ibdev_name);
-       sh->modify_cmds = mlx5_hlist_create(s, MLX5_FLOW_HDR_MODIFY_HTABLE_SZ);
+       sh->modify_cmds = mlx5_hlist_create(s, MLX5_FLOW_HDR_MODIFY_HTABLE_SZ,
+                                           0, MLX5_HLIST_WRITE_MOST |
+                                           MLX5_HLIST_DIRECT_KEY,
+                                           flow_dv_modify_create_cb,
+                                           flow_dv_modify_match_cb,
+                                           flow_dv_modify_remove_cb);
        if (!sh->modify_cmds) {
                DRV_LOG(ERR, "hdr modify hash creation failed");
                err = ENOMEM;
                goto error;
        }
+       sh->modify_cmds->ctx = sh;
        snprintf(s, sizeof(s), "%s_encaps_decaps", sh->ibdev_name);
        sh->encaps_decaps = mlx5_hlist_create(s,
-                                             MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ);
+                                             MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ,
+                                             0, MLX5_HLIST_DIRECT_KEY |
+                                             MLX5_HLIST_WRITE_MOST,
+                                             flow_dv_encap_decap_create_cb,
+                                             flow_dv_encap_decap_match_cb,
+                                             flow_dv_encap_decap_remove_cb);
        if (!sh->encaps_decaps) {
                DRV_LOG(ERR, "encap decap hash creation failed");
                err = ENOMEM;
                goto error;
        }
+       sh->encaps_decaps->ctx = sh;
+#endif
 #ifdef HAVE_MLX5DV_DR
        void *domain;
 
@@ -333,16 +352,16 @@ error:
                sh->pop_vlan_action = NULL;
        }
        if (sh->encaps_decaps) {
-               mlx5_hlist_destroy(sh->encaps_decaps, NULL, NULL);
+               mlx5_hlist_destroy(sh->encaps_decaps);
                sh->encaps_decaps = NULL;
        }
        if (sh->modify_cmds) {
-               mlx5_hlist_destroy(sh->modify_cmds, NULL, NULL);
+               mlx5_hlist_destroy(sh->modify_cmds);
                sh->modify_cmds = NULL;
        }
        if (sh->tag_table) {
                /* tags should be destroyed with flow before. */
-               mlx5_hlist_destroy(sh->tag_table, NULL, NULL);
+               mlx5_hlist_destroy(sh->tag_table);
                sh->tag_table = NULL;
        }
        if (sh->tunnel_hub) {
@@ -396,16 +415,16 @@ mlx5_os_free_shared_dr(struct mlx5_priv *priv)
                mlx5_glue->destroy_flow_action
                                (sh->default_miss_action);
        if (sh->encaps_decaps) {
-               mlx5_hlist_destroy(sh->encaps_decaps, NULL, NULL);
+               mlx5_hlist_destroy(sh->encaps_decaps);
                sh->encaps_decaps = NULL;
        }
        if (sh->modify_cmds) {
-               mlx5_hlist_destroy(sh->modify_cmds, NULL, NULL);
+               mlx5_hlist_destroy(sh->modify_cmds);
                sh->modify_cmds = NULL;
        }
        if (sh->tag_table) {
                /* tags should be destroyed with flow before. */
-               mlx5_hlist_destroy(sh->tag_table, NULL, NULL);
+               mlx5_hlist_destroy(sh->tag_table);
                sh->tag_table = NULL;
        }
        if (sh->tunnel_hub) {
@@ -1424,6 +1443,9 @@ err_secondary:
        } else {
                priv->obj_ops = ibv_obj_ops;
        }
+       priv->drop_queue.hrxq = mlx5_drop_action_create(eth_dev);
+       if (!priv->drop_queue.hrxq)
+               goto error;
        /* Supported Verbs flow priority number detection. */
        err = mlx5_flow_discover_priorities(eth_dev);
        if (err < 0) {
@@ -1469,18 +1491,23 @@ err_secondary:
            mlx5_flow_ext_mreg_supported(eth_dev) &&
            priv->sh->dv_regc0_mask) {
                priv->mreg_cp_tbl = mlx5_hlist_create(MLX5_FLOW_MREG_HNAME,
-                                                     MLX5_FLOW_MREG_HTABLE_SZ);
+                                                     MLX5_FLOW_MREG_HTABLE_SZ,
+                                                     0, 0,
+                                                     flow_dv_mreg_create_cb,
+                                                     NULL,
+                                                     flow_dv_mreg_remove_cb);
                if (!priv->mreg_cp_tbl) {
                        err = ENOMEM;
                        goto error;
                }
+               priv->mreg_cp_tbl->ctx = eth_dev;
        }
        mlx5_flow_counter_mode_config(eth_dev);
        return eth_dev;
 error:
        if (priv) {
                if (priv->mreg_cp_tbl)
-                       mlx5_hlist_destroy(priv->mreg_cp_tbl, NULL, NULL);
+                       mlx5_hlist_destroy(priv->mreg_cp_tbl);
                if (priv->sh)
                        mlx5_os_free_shared_dr(priv);
                if (priv->nl_socket_route >= 0)
@@ -1489,6 +1516,8 @@ error:
                        close(priv->nl_socket_rdma);
                if (priv->vmwa_context)
                        mlx5_vlan_vmwa_exit(priv->vmwa_context);
+               if (eth_dev && priv->drop_queue.hrxq)
+                       mlx5_drop_action_destroy(eth_dev);
                if (own_domain_id)
                        claim_zero(rte_eth_switch_domain_free(priv->domain_id));
                mlx5_free(priv);