net/mlx5: fix setting of Rx hash fields

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

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index d9da6f8..50960c9 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -443,7 +443,8 @@ mlx5_config_doorbell_mapping_env(const struct mlx5_dev_config *config)
        if (config->dbnc == MLX5_ARG_UNSET)
                setenv(MLX5_SHUT_UP_BF, MLX5_SHUT_UP_BF_DEFAULT, 1);
        else
-               setenv(MLX5_SHUT_UP_BF, config->dbnc ? "1" : "0", 1);
+               setenv(MLX5_SHUT_UP_BF,
+                      config->dbnc == MLX5_TXDB_NCACHED ? "1" : "0", 1);
        return value;
 }
 
@@ -865,13 +866,26 @@ error:
 static int
 mlx5_alloc_shared_dr(struct mlx5_priv *priv)
 {
-       int err = mlx5_alloc_table_hash_list(priv);
+       struct mlx5_ibv_shared *sh = priv->sh;
+       char s[MLX5_HLIST_NAMESIZE];
+       int err = 0;
 
+       if (!sh->flow_tbls)
+               err = mlx5_alloc_table_hash_list(priv);
+       else
+               DRV_LOG(DEBUG, "sh->flow_tbls[%p] already created, reuse\n",
+                       (void *)sh->flow_tbls);
        if (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
-       struct mlx5_ibv_shared *sh = priv->sh;
-       char s[MLX5_HLIST_NAMESIZE];
        void *domain;
 
        if (sh->dv_refcnt) {
@@ -911,20 +925,13 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
                sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
        }
 #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();
+#endif /* HAVE_MLX5DV_DR */
        sh->dv_refcnt++;
        priv->dr_shared = 1;
        return 0;
-
 error:
-       /* Rollback the created objects. */
+       /* Rollback the created objects. */
        if (sh->rx_domain) {
                mlx5_glue->dr_destroy_domain(sh->rx_domain);
                sh->rx_domain = NULL;
@@ -945,8 +952,12 @@ error:
                mlx5_glue->destroy_flow_action(sh->pop_vlan_action);
                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);
-#endif
        return err;
 }
 
@@ -959,7 +970,6 @@ error:
 static void
 mlx5_free_shared_dr(struct mlx5_priv *priv)
 {
-#ifdef HAVE_MLX5DV_DR
        struct mlx5_ibv_shared *sh;
 
        if (!priv->dr_shared)
@@ -967,6 +977,7 @@ mlx5_free_shared_dr(struct mlx5_priv *priv)
        priv->dr_shared = 0;
        sh = priv->sh;
        assert(sh);
+#ifdef HAVE_MLX5DV_DR
        assert(sh->dv_refcnt);
        if (sh->dv_refcnt && --sh->dv_refcnt)
                return;
@@ -988,17 +999,17 @@ mlx5_free_shared_dr(struct mlx5_priv *priv)
                sh->esw_drop_action = NULL;
        }
 #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) {
                mlx5_glue->destroy_flow_action(sh->pop_vlan_action);
                sh->pop_vlan_action = NULL;
        }
        pthread_mutex_destroy(&sh->dv_mutex);
 #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);
 }
 
@@ -1505,7 +1516,15 @@ mlx5_args_check(const char *key, const char *val, void *opaque)
        } else if (strcmp(MLX5_TXQ_MPW_EN, key) == 0) {
                config->mps = !!tmp;
        } else if (strcmp(MLX5_TX_DB_NC, key) == 0) {
-               config->dbnc = !!tmp;
+               if (tmp != MLX5_TXDB_CACHED &&
+                   tmp != MLX5_TXDB_NCACHED &&
+                   tmp != MLX5_TXDB_HEURISTIC) {
+                       DRV_LOG(ERR, "invalid Tx doorbell "
+                                    "mapping parameter");
+                       rte_errno = EINVAL;
+                       return -rte_errno;
+               }
+               config->dbnc = tmp;
        } else if (strcmp(MLX5_TXQ_MPW_HDR_DSEG_EN, key) == 0) {
                DRV_LOG(WARNING, "%s: deprecated parameter, ignored", key);
        } else if (strcmp(MLX5_TXQ_MAX_INLINE_LEN, key) == 0) {
@@ -1528,8 +1547,8 @@ mlx5_args_check(const char *key, const char *val, void *opaque)
                if (tmp != MLX5_XMETA_MODE_LEGACY &&
                    tmp != MLX5_XMETA_MODE_META16 &&
                    tmp != MLX5_XMETA_MODE_META32) {
-                       DRV_LOG(WARNING, "invalid extensive "
-                                        "metadata parameter");
+                       DRV_LOG(ERR, "invalid extensive "
+                                    "metadata parameter");
                        rte_errno = EINVAL;
                        return -rte_errno;
                }
@@ -2242,7 +2261,9 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                tunnel_en = ((dv_attr.tunnel_offloads_caps &
                              MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_VXLAN) &&
                             (dv_attr.tunnel_offloads_caps &
-                             MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE));
+                             MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GRE) &&
+                            (dv_attr.tunnel_offloads_caps &
+                             MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_GENEVE));
        }
        DRV_LOG(DEBUG, "tunnel offloading is %ssupported",
                tunnel_en ? "" : "not ");
@@ -2343,7 +2364,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                        err = ENOTSUP;
                        goto error;
                }
-       } else if (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) {
+       }
+       if (devx_port.comp_mask & MLX5DV_DEVX_PORT_VPORT) {
                priv->vport_id = devx_port.vport_num;
        } else if (spawn->pf_bond >= 0) {
                DRV_LOG(ERR, "can't deduce vport index for port %d"
@@ -2413,7 +2435,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        !defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45)
        DRV_LOG(DEBUG, "counters are not supported");
 #endif
-#ifndef HAVE_IBV_FLOW_DV_SUPPORT
+#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
        if (config.dv_flow_en) {
                DRV_LOG(WARNING, "DV flow is not supported");
                config.dv_flow_en = 0;
@@ -2464,7 +2486,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        else
                config.mps = config.mps ? mps : MLX5_MPW_DISABLED;
        DRV_LOG(INFO, "%sMPS is %s",
-               config.mps == MLX5_MPW_ENHANCED ? "enhanced " : "",
+               config.mps == MLX5_MPW_ENHANCED ? "enhanced " :
+               config.mps == MLX5_MPW ? "legacy " : "",
                config.mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
        if (config.cqe_comp && !cqe_comp) {
                DRV_LOG(WARNING, "Rx CQE compression isn't supported");
@@ -3261,6 +3284,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                        .min_rxqs_num = MLX5_MPRQ_MIN_RXQS,
                },
                .dv_esw_en = 1,
+               .dv_flow_en = 1,
        };
        /* Device specific configuration. */
        switch (pci_dev->id.device_id) {