net/hns3: increase VF reset retry maximum

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

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 7e83d09..d0faa45 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -708,6 +708,60 @@ mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh)
        return 0;
 }
 
+/*
+ * Close and release all the resources of the
+ * ASO connection tracking management structure.
+ *
+ * @param[in] sh
+ *   Pointer to mlx5_dev_ctx_shared object to free.
+ */
+static void
+mlx5_flow_aso_ct_mng_close(struct mlx5_dev_ctx_shared *sh)
+{
+       struct mlx5_aso_ct_pools_mng *mng = sh->ct_mng;
+       struct mlx5_aso_ct_pool *ct_pool;
+       struct mlx5_aso_ct_action *ct;
+       uint32_t idx;
+       uint32_t val;
+       uint32_t cnt;
+       int i;
+
+       mlx5_aso_queue_uninit(sh, ASO_OPC_MOD_CONNECTION_TRACKING);
+       idx = mng->next;
+       while (idx--) {
+               cnt = 0;
+               ct_pool = mng->pools[idx];
+               for (i = 0; i < MLX5_ASO_CT_ACTIONS_PER_POOL; i++) {
+                       ct = &ct_pool->actions[i];
+                       val = __atomic_fetch_sub(&ct->refcnt, 1,
+                                                __ATOMIC_RELAXED);
+                       MLX5_ASSERT(val == 1);
+                       if (val > 1)
+                               cnt++;
+#ifdef HAVE_MLX5_DR_ACTION_ASO_CT
+                       if (ct->dr_action_orig)
+                               claim_zero(mlx5_glue->destroy_flow_action
+                                                       (ct->dr_action_orig));
+                       if (ct->dr_action_rply)
+                               claim_zero(mlx5_glue->destroy_flow_action
+                                                       (ct->dr_action_rply));
+#endif
+               }
+               claim_zero(mlx5_devx_cmd_destroy(ct_pool->devx_obj));
+               if (cnt) {
+                       DRV_LOG(DEBUG, "%u ASO CT objects are being used in the pool %u",
+                               cnt, i);
+               }
+               mlx5_free(ct_pool);
+               /* in case of failure. */
+               mng->next--;
+       }
+       mlx5_free(mng->pools);
+       mlx5_free(mng);
+       /* Management structure must be cleared to 0s during allocation. */
+       sh->ct_mng = NULL;
+}
+
 /**
  * Initialize the flow resources' indexed mempool.
  *
@@ -1401,6 +1455,7 @@ mlx5_proc_priv_init(struct rte_eth_dev *dev)
        struct mlx5_proc_priv *ppriv;
        size_t ppriv_size;
 
+       mlx5_proc_priv_uninit(dev);
        /*
         * UAR register table follows the process private structure. BlueFlame
         * registers for Tx queues are stored in the table.
@@ -1510,6 +1565,8 @@ mlx5_dev_close(struct rte_eth_dev *dev)
        if (priv->mreg_cp_tbl)
                mlx5_hlist_destroy(priv->mreg_cp_tbl);
        mlx5_mprq_free_mp(dev);
+       if (priv->sh->ct_mng)
+               mlx5_flow_aso_ct_mng_close(priv->sh);
        mlx5_os_free_shared_dr(priv);
        if (priv->rss_conf.rss_key != NULL)
                mlx5_free(priv->rss_conf.rss_key);
@@ -1874,7 +1931,7 @@ mlx5_args_check(const char *key, const char *val, void *opaque)
                config->max_dump_files_num = tmp;
        } else if (strcmp(MLX5_LRO_TIMEOUT_USEC, key) == 0) {
                config->lro.timeout = tmp;
-       } else if (strcmp(MLX5_CLASS_ARG_NAME, key) == 0) {
+       } else if (strcmp(RTE_DEVARGS_KEY_CLASS, key) == 0) {
                DRV_LOG(DEBUG, "class argument is %s.", val);
        } else if (strcmp(MLX5_HP_BUF_SIZE, key) == 0) {
                config->log_hp_size = tmp;
@@ -1945,7 +2002,7 @@ mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs)
                MLX5_REPRESENTOR,
                MLX5_MAX_DUMP_FILES_NUM,
                MLX5_LRO_TIMEOUT_USEC,
-               MLX5_CLASS_ARG_NAME,
+               RTE_DEVARGS_KEY_CLASS,
                MLX5_HP_BUF_SIZE,
                MLX5_RECLAIM_MEM,
                MLX5_SYS_MEM_EN,
@@ -2386,7 +2443,7 @@ static struct mlx5_pci_driver mlx5_driver = {
 };
 
 /* Initialize driver log type. */
-RTE_LOG_REGISTER(mlx5_logtype, pmd.net.mlx5, NOTICE)
+RTE_LOG_REGISTER_DEFAULT(mlx5_logtype, NOTICE)
 
 /**
  * Driver initialization routine.