net/mlx5: initialize flow meter ASO SQ

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

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 02cc2c7..00055e3 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -277,10 +277,13 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = {
        },
 #endif
        [MLX5_IPOOL_MTR] = {
-               .size = sizeof(struct mlx5_flow_meter),
+               /**
+                * The ipool index should grow continually from small to big,
+                * for meter idx, so not set grow_trunk to avoid meter index
+                * not jump continually.
+                */
+               .size = sizeof(struct mlx5_legacy_flow_meter),
                .trunk_size = 64,
-               .grow_trunk = 3,
-               .grow_shift = 2,
                .need_lock = 1,
                .release_mem_en = 1,
                .malloc = mlx5_malloc,
@@ -400,7 +403,7 @@ mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh)
                rte_errno = ENOMEM;
                return -ENOMEM;
        }
-       err = mlx5_aso_queue_init(sh);
+       err = mlx5_aso_queue_init(sh, ASO_OPC_MOD_FLOW_HIT);
        if (err) {
                mlx5_free(sh->aso_age_mng);
                return -1;
@@ -422,8 +425,8 @@ mlx5_flow_aso_age_mng_close(struct mlx5_dev_ctx_shared *sh)
 {
        int i, j;
 
-       mlx5_aso_queue_stop(sh);
-       mlx5_aso_queue_uninit(sh);
+       mlx5_aso_flow_hit_queue_poll_stop(sh);
+       mlx5_aso_queue_uninit(sh, ASO_OPC_MOD_FLOW_HIT);
        if (sh->aso_age_mng->pools) {
                struct mlx5_aso_age_pool *pool;
 
@@ -561,6 +564,66 @@ mlx5_flow_counters_mng_close(struct mlx5_dev_ctx_shared *sh)
        memset(&sh->cmng, 0, sizeof(sh->cmng));
 }
 
+/**
+ * Initialize the aso flow meters management structure.
+ *
+ * @param[in] sh
+ *   Pointer to mlx5_dev_ctx_shared object to free
+ */
+int
+mlx5_aso_flow_mtrs_mng_init(struct mlx5_priv *priv)
+{
+       if (!priv->mtr_idx_tbl) {
+               priv->mtr_idx_tbl = mlx5_l3t_create(MLX5_L3T_TYPE_DWORD);
+               if (!priv->mtr_idx_tbl) {
+                       DRV_LOG(ERR, "fail to create meter lookup table.");
+                       rte_errno = ENOMEM;
+                       return -ENOMEM;
+               }
+       }
+       if (!priv->sh->mtrmng) {
+               priv->sh->mtrmng = mlx5_malloc(MLX5_MEM_ZERO,
+                       sizeof(*priv->sh->mtrmng),
+                       RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+               if (!priv->sh->mtrmng) {
+                       DRV_LOG(ERR, "mlx5_aso_mtr_pools_mng allocation was failed.");
+                       rte_errno = ENOMEM;
+                       return -ENOMEM;
+               }
+               rte_spinlock_init(&priv->sh->mtrmng->mtrsl);
+               LIST_INIT(&priv->sh->mtrmng->meters);
+       }
+       return 0;
+}
+
+/**
+ * Close and release all the resources of
+ * the ASO flow meter management structure.
+ *
+ * @param[in] sh
+ *   Pointer to mlx5_dev_ctx_shared object to free.
+ */
+static void
+mlx5_aso_flow_mtrs_mng_close(struct mlx5_dev_ctx_shared *sh)
+{
+       struct mlx5_aso_mtr_pool *mtr_pool;
+       struct mlx5_aso_mtr_pools_mng *mtrmng = sh->mtrmng;
+       uint32_t idx;
+
+       mlx5_aso_queue_uninit(sh, ASO_OPC_MOD_POLICER);
+       idx = mtrmng->n_valid;
+       while (idx--) {
+               mtr_pool = mtrmng->pools[idx];
+               claim_zero(mlx5_devx_cmd_destroy
+                                               (mtr_pool->devx_obj));
+               mtrmng->n_valid--;
+               mlx5_free(mtr_pool);
+       }
+       mlx5_free(sh->mtrmng->pools);
+       mlx5_free(sh->mtrmng);
+       sh->mtrmng = NULL;
+}
+
 /* Send FLOW_AGED event if needed. */
 void
 mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh)
@@ -1110,6 +1173,8 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh)
                mlx5_flow_aso_age_mng_close(sh);
                sh->aso_age_mng = NULL;
        }
+       if (sh->mtrmng)
+               mlx5_aso_flow_mtrs_mng_close(sh);
        mlx5_flow_ipool_destroy(sh);
        mlx5_os_dev_shared_handler_uninstall(sh);
        if (sh->cnt_id_tbl) {
@@ -1341,7 +1406,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)
         * then this will return directly without any action.
         */
        mlx5_flow_list_flush(dev, &priv->flows, true);
-       mlx5_shared_action_flush(dev);
+       mlx5_action_handle_flush(dev);
        mlx5_flow_meter_flush(dev, NULL);
        /* Prevent crashes when queues are still in use. */
        dev->rx_pkt_burst = removed_rx_burst;