net/mlx5: support maximum flow id allocation

The id allocated is for the register unique id match. Some registers may
not use the full 32 bits. Add the maximum id to avoid allocate id over
the register restriction.

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index ffee39c1a0c73fe00bdef4d2b8fbaf54be7151c6..2c9f7055fc38025ae58ea5f8decd9a131940798b 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -196,11 +196,14 @@ static pthread_mutex_t mlx5_ibv_list_mutex = PTHREAD_MUTEX_INITIALIZER;
 /**
  * Allocate ID pool structure.
  *
+ * @param[in] max_id
+ *   The maximum id can be allocated from the pool.
+ *
  * @return
  *   Pointer to pool object, NULL value otherwise.
  */
 struct mlx5_flow_id_pool *
-mlx5_flow_id_pool_alloc(void)
+mlx5_flow_id_pool_alloc(uint32_t max_id)
 {
        struct mlx5_flow_id_pool *pool;
        void *mem;
@@ -223,6 +226,7 @@ mlx5_flow_id_pool_alloc(void)
        pool->curr = pool->free_arr;
        pool->last = pool->free_arr + MLX5_FLOW_MIN_ID_POOL_SIZE;
        pool->base_index = 0;
+       pool->max_id = max_id;
        return pool;
 error:
        rte_free(pool);
@@ -257,7 +261,7 @@ uint32_t
 mlx5_flow_id_get(struct mlx5_flow_id_pool *pool, uint32_t *id)
 {
        if (pool->curr == pool->free_arr) {
-               if (pool->base_index == UINT32_MAX) {
+               if (pool->base_index == pool->max_id) {
                        rte_errno  = ENOMEM;
                        DRV_LOG(ERR, "no free id");
                        return -rte_errno;
@@ -590,7 +594,7 @@ mlx5_alloc_shared_ibctx(const struct mlx5_dev_spawn_data *spawn,
                        goto error;
                }
        }
-       sh->flow_id_pool = mlx5_flow_id_pool_alloc();
+       sh->flow_id_pool = mlx5_flow_id_pool_alloc(UINT32_MAX);
        if (!sh->flow_id_pool) {
                DRV_LOG(ERR, "can't create flow id pool");
                err = ENOMEM;
@@ -2680,7 +2684,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                err = mlx5_alloc_shared_dr(priv);
                if (err)
                        goto error;
-               priv->qrss_id_pool = mlx5_flow_id_pool_alloc();
+               priv->qrss_id_pool = mlx5_flow_id_pool_alloc(UINT32_MAX);
                if (!priv->qrss_id_pool) {
                        DRV_LOG(ERR, "can't create flow id pool");
                        err = ENOMEM;

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 01542e7e968fb0d119055e75f1aa8b56ecb9d13d..ac86c19df72177e44e35bab7a78a96cec2a5aa17 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -630,6 +630,7 @@ struct mlx5_flow_id_pool {
        /**< The next index that can be used without any free elements. */
        uint32_t *curr; /**< Pointer to the index to pop. */
        uint32_t *last; /**< Pointer to the last element in the empty arrray. */
+       uint32_t max_id; /**< Maximum id can be allocated from the pool. */
 };
 
 /*

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index aaacf5c2557101989bafa017ea0d6e05f57b00b2..39be5ba09547fd40f6c23cfee9814e17410209a1 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -747,7 +747,7 @@ struct mlx5_flow_driver_ops {
 
 /* mlx5_flow.c */
 
-struct mlx5_flow_id_pool *mlx5_flow_id_pool_alloc(void);
+struct mlx5_flow_id_pool *mlx5_flow_id_pool_alloc(uint32_t max_id);
 void mlx5_flow_id_pool_release(struct mlx5_flow_id_pool *pool);
 uint32_t mlx5_flow_id_get(struct mlx5_flow_id_pool *pool, uint32_t *id);
 uint32_t mlx5_flow_id_release(struct mlx5_flow_id_pool *pool,