net/mlx5: fix Verbs counter pool allocation

When create the Verbs flows with counter, randomly SEGSEV will also
comes. The reason is that the counter pool memory is not allocated
sufficiently and initialized correctly in Verbs case.

As the mlx5_flow_counter array member is moved out of the counter pool
struct, the counter pool memory layout currently contain implicitly
with mlx5_flow_counter, mlx5_age_param(if the pool is an age pool),
mlx5_flow_counter_ext(if the pool is a none batch pool). When allocate
the pool memory, the pool size should be calculated based on the pool
type accordingly.

Currently, for Verbs counter pool, both mlx5_flow_counter and
mlx5_flow_counter_ext need to be taken into account in the pool size.
And the pool type should also be initialized as CNT_POOL_TYPE_EXT.

This patch add the missing size and type for the Verbs counter pool.

Fixes: 8d93c830e450 ("net/mlx5: modify ext-counter memory allocation")

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 01eec31..c266e56 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -201,11 +201,12 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
                        cont->n += MLX5_CNT_CONTAINER_RESIZE;
                }
                /* Allocate memory for new pool*/
-               size = sizeof(*pool) + sizeof(*cnt_ext) *
+               size = sizeof(*pool) + (sizeof(*cnt_ext) + sizeof(*cnt)) *
                       MLX5_COUNTERS_PER_POOL;
                pool = rte_calloc(__func__, 1, size, 0);
                if (!pool)
                        return 0;
+               pool->type |= CNT_POOL_TYPE_EXT;
                for (i = 0; i < MLX5_COUNTERS_PER_POOL; ++i) {
                        cnt = MLX5_POOL_GET_CNT(pool, i);
                        TAILQ_INSERT_HEAD(&pool->counters, cnt, next);