net/mlx5: remove redundant check of devargs

The device arguments are parsed and updated twice during spawning. First
time before creating the share device context, and again later after
updating a default value to one of the arguments.

This patch consolidates them into one parsing and updates the default
values before it.

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index faab310..191da1b 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -968,22 +968,45 @@ err_secondary:
                mlx5_dev_close(eth_dev);
                return NULL;
        }
-       /*
-        * Some parameters ("tx_db_nc" in particularly) are needed in
-        * advance to create dv/verbs device context. We proceed the
-        * devargs here to get ones, and later proceed devargs again
-        * to override some hardware settings.
-        */
+       /* Process parameters. */
        err = mlx5_args(config, dpdk_dev->devargs);
        if (err) {
-               err = rte_errno;
                DRV_LOG(ERR, "failed to process device arguments: %s",
                        strerror(rte_errno));
-               goto error;
+               return NULL;
        }
        sh = mlx5_alloc_shared_dev_ctx(spawn, config);
        if (!sh)
                return NULL;
+       /* Update final values for devargs before check sibling config. */
+       if (config->dv_miss_info) {
+               if (switch_info->master || switch_info->representor)
+                       config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
+       }
+#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;
+       }
+#endif
+#ifdef HAVE_MLX5DV_DR_ESWITCH
+       if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
+             (switch_info->representor || switch_info->master)))
+               config->dv_esw_en = 0;
+#else
+       config->dv_esw_en = 0;
+#endif
+       if (!config->dv_esw_en &&
+           config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
+               DRV_LOG(WARNING,
+                       "Metadata mode %u is not supported (no E-Switch).",
+                       config->dv_xmeta_en);
+               config->dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
+       }
+       /* Check sibling device configurations. */
+       err = mlx5_dev_check_sibling_config(sh, config, dpdk_dev);
+       if (err)
+               goto error;
 #ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR
        config->dest_tir = 1;
 #endif
@@ -1049,8 +1072,6 @@ err_secondary:
                        mprq_caps.max_single_wqe_log_num_of_strides;
        }
 #endif
-       /* Rx CQE compression is enabled by default. */
-       config->cqe_comp = 1;
 #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
        if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
                config->tunnel_en = dv_attr.tunnel_offloads_caps &
@@ -1239,37 +1260,6 @@ err_secondary:
                DRV_LOG(DEBUG, "dev_port-%u new domain_id=%u\n",
                        priv->dev_port, priv->domain_id);
        }
-       /* Override some values set by hardware configuration. */
-       mlx5_args(config, dpdk_dev->devargs);
-       /* Update final values for devargs before check sibling config. */
-       if (config->dv_miss_info) {
-               if (switch_info->master || switch_info->representor)
-                       config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
-       }
-#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;
-       }
-#endif
-#ifdef HAVE_MLX5DV_DR_ESWITCH
-       if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
-             (switch_info->representor || switch_info->master)))
-               config->dv_esw_en = 0;
-#else
-       config->dv_esw_en = 0;
-#endif
-       if (!priv->config.dv_esw_en &&
-           priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
-               DRV_LOG(WARNING,
-                       "Metadata mode %u is not supported (no E-Switch).",
-                       priv->config.dv_xmeta_en);
-               priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
-       }
-       /* Check sibling device configurations. */
-       err = mlx5_dev_check_sibling_config(priv, config, dpdk_dev);
-       if (err)
-               goto error;
        config->hw_csum = !!(sh->device_attr.device_cap_flags_ex &
                            IBV_DEVICE_RAW_IP_CSUM);
        DRV_LOG(DEBUG, "checksum offloading is %ssupported",
@@ -2049,6 +2039,7 @@ mlx5_os_config_default(struct mlx5_dev_config *config,
 {
        memset(config, 0, sizeof(*config));
        config->mps = MLX5_ARG_UNSET;
+       config->cqe_comp = 1;
        config->rx_vec_en = 1;
        config->txq_inline_max = MLX5_ARG_UNSET;
        config->txq_inline_min = MLX5_ARG_UNSET;

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 0e154b8..d1215e5 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -2216,25 +2216,26 @@ rte_pmd_mlx5_get_dyn_flag_names(char *names[], unsigned int n)
 }
 
 /**
- * Comparison callback to sort device data.
+ * Check sibling device configurations.
  *
- * This is meant to be used with qsort().
+ * Sibling devices sharing the Infiniband device context should have compatible
+ * configurations. This regards representors and bonding device.
  *
- * @param a[in]
- *   Pointer to pointer to first data object.
- * @param b[in]
- *   Pointer to pointer to second data object.
+ * @param sh
+ *   Shared device context.
+ * @param config
+ *   Configuration of the device is going to be created.
+ * @param dpdk_dev
+ *   Backing DPDK device.
  *
  * @return
- *   0 if both objects are equal, less than 0 if the first argument is less
- *   than the second, greater than 0 otherwise.
+ *   0 on success, EINVAL otherwise
  */
 int
-mlx5_dev_check_sibling_config(struct mlx5_priv *priv,
+mlx5_dev_check_sibling_config(struct mlx5_dev_ctx_shared *sh,
                              struct mlx5_dev_config *config,
                              struct rte_device *dpdk_dev)
 {
-       struct mlx5_dev_ctx_shared *sh = priv->sh;
        struct mlx5_dev_config *sh_conf = NULL;
        uint16_t port_id;
 
@@ -2247,7 +2248,7 @@ mlx5_dev_check_sibling_config(struct mlx5_priv *priv,
                struct mlx5_priv *opriv =
                        rte_eth_devices[port_id].data->dev_private;
 
-               if (opriv && opriv != priv && opriv->sh == sh) {
+               if (opriv && opriv->sh == sh) {
                        sh_conf = &opriv->config;
                        break;
                }

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 823a943..e4b2523 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1529,7 +1529,7 @@ int mlx5_alloc_table_hash_list(struct mlx5_priv *priv);
 void mlx5_set_min_inline(struct mlx5_dev_spawn_data *spawn,
                         struct mlx5_dev_config *config);
 void mlx5_set_metadata_mask(struct rte_eth_dev *dev);
-int mlx5_dev_check_sibling_config(struct mlx5_priv *priv,
+int mlx5_dev_check_sibling_config(struct mlx5_dev_ctx_shared *sh,
                                  struct mlx5_dev_config *config,
                                  struct rte_device *dpdk_dev);
 bool mlx5_flex_parser_ecpri_exist(struct rte_eth_dev *dev);

diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c
index a9619e5..0966da1 100644 (file)
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -321,7 +321,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        struct rte_eth_dev *eth_dev = NULL;
        struct mlx5_priv *priv = NULL;
        int err = 0;
-       unsigned int cqe_comp;
        struct rte_ether_addr mac;
        char name[RTE_ETH_NAME_MAX_LEN];
        int own_domain_id = 0;
@@ -336,11 +335,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                return NULL;
        }
        DRV_LOG(DEBUG, "naming Ethernet device \"%s\"", name);
-       /*
-        * Some parameters are needed in advance to create device context. We
-        * process the devargs here to get ones, and later process devargs
-        * again to override some hardware settings.
-        */
+       /* Process parameters. */
        err = mlx5_args(config, dpdk_dev->devargs);
        if (err) {
                err = rte_errno;
@@ -351,6 +346,24 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        sh = mlx5_alloc_shared_dev_ctx(spawn, config);
        if (!sh)
                return NULL;
+       /* Update final values for devargs before check sibling config. */
+       config->dv_esw_en = 0;
+       if (!config->dv_flow_en) {
+               DRV_LOG(ERR, "Windows flow mode must be DV flow enable.");
+               err = ENOTSUP;
+               goto error;
+       }
+       if (!config->dv_esw_en &&
+           config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
+               DRV_LOG(WARNING,
+                       "Metadata mode %u is not supported (no E-Switch).",
+                       config->dv_xmeta_en);
+               config->dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
+       }
+       /* Check sibling device configurations. */
+       err = mlx5_dev_check_sibling_config(sh, config, dpdk_dev);
+       if (err)
+               goto error;
        /* Initialize the shutdown event in mlx5_dev_spawn to
         * support mlx5_is_removed for Windows.
         */
@@ -367,8 +380,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                 MLX5_SW_PARSING_TSO_CAP);
        config->ind_table_max_size =
                sh->device_attr.max_rwq_indirection_table_size;
-       cqe_comp = 0;
-       config->cqe_comp = cqe_comp;
        config->tunnel_en = device_attr.tunnel_offloads_caps &
                (MLX5_TUNNELED_OFFLOADS_VXLAN_CAP |
                 MLX5_TUNNELED_OFFLOADS_GRE_CAP |
@@ -437,26 +448,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                }
                own_domain_id = 1;
        }
-       /* Override some values set by hardware configuration. */
-       mlx5_args(config, dpdk_dev->devargs);
-       /* Update final values for devargs before check sibling config. */
-       config->dv_esw_en = 0;
-       if (!config->dv_flow_en) {
-               DRV_LOG(ERR, "Windows flow mode must be DV flow enable.");
-               err = ENOTSUP;
-               goto error;
-       }
-       if (!priv->config.dv_esw_en &&
-           priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
-               DRV_LOG(WARNING,
-                       "Metadata mode %u is not supported (no E-Switch).",
-                       priv->config.dv_xmeta_en);
-               priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
-       }
-       /* Check sibling device configurations. */
-       err = mlx5_dev_check_sibling_config(priv, config, dpdk_dev);
-       if (err)
-               goto error;
        DRV_LOG(DEBUG, "counters are not supported");
        config->ind_table_max_size =
                sh->device_attr.max_rwq_indirection_table_size;
@@ -479,7 +470,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                config->mps == MLX5_MPW_ENHANCED ? "enhanced " :
                config->mps == MLX5_MPW ? "legacy " : "",
                config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
-       if (config->cqe_comp && !cqe_comp) {
+       if (config->cqe_comp) {
                DRV_LOG(WARNING, "Rx CQE compression isn't supported.");
                config->cqe_comp = 0;
        }