@@ -256,6 +256,17 @@ struct mlx5_dev_spawn_data {
},
#endif
{
+ .size = sizeof(struct mlx5_flow_meter),
+ .trunk_size = 64,
+ .grow_trunk = 3,
+ .grow_shift = 2,
+ .need_lock = 0,
+ .release_mem_en = 1,
+ .malloc = rte_malloc_socket,
+ .free = rte_free,
+ .type = "mlx5_meter_ipool",
+ },
+ {
.size = (sizeof(struct mlx5_hrxq) + MLX5_RSS_HASH_KEY_LEN),
.trunk_size = 64,
.grow_trunk = 3,
@@ -59,6 +59,7 @@ enum mlx5_ipool_index {
MLX5_IPOOL_PORT_ID, /* Pool for port id resource. */
MLX5_IPOOL_JUMP, /* Pool for jump resource. */
#endif
+ MLX5_IPOOL_MTR, /* Pool for meter resource. */
MLX5_IPOOL_HRXQ, /* Pool for hrxq resource. */
MLX5_IPOOL_MLX5_FLOW, /* Pool for mlx5 flow handle. */
MLX5_IPOOL_RTE_FLOW, /* Pool for rte_flow. */
@@ -705,6 +705,7 @@ struct mlx5_meter_domains_infos {
struct mlx5_flow_meter {
TAILQ_ENTRY(mlx5_flow_meter) next;
/**< Pointer to the next flow meter structure. */
+ uint32_t idx; /* Index to meter object. */
uint32_t meter_id;
/**< Meter id. */
struct rte_mtr_params params;
@@ -631,6 +631,7 @@
};
int ret;
unsigned int i;
+ uint32_t idx = 0;
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
@@ -647,12 +648,12 @@
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
NULL, "Meter profile id not valid.");
/* Allocate the flow meter memory. */
- fm = rte_calloc(__func__, 1,
- sizeof(struct mlx5_flow_meter), RTE_CACHE_LINE_SIZE);
+ fm = mlx5_ipool_zmalloc(priv->sh->ipool[MLX5_IPOOL_MTR], &idx);
if (fm == NULL)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
"Memory alloc failed for meter.");
+ fm->idx = idx;
/* Fill the flow meter parameters. */
fm->meter_id = meter_id;
fm->profile = fmp;
@@ -683,7 +684,7 @@
for (i = 0; i < RTE_DIM(fm->policer_stats.cnt); i++)
if (fm->policer_stats.cnt[i])
mlx5_counter_free(dev, fm->policer_stats.cnt[i]);
- rte_free(fm);
+ mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], idx);
return -rte_mtr_error_set(error, -ret,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
NULL, "Failed to create devx meter.");
@@ -746,7 +747,7 @@
/* Free meter flow table */
mlx5_flow_destroy_policer_rules(dev, fm, &attr);
mlx5_flow_destroy_mtr_tbls(dev, fm->mfts);
- rte_free(fm);
+ mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], fm->idx);
return 0;
}
@@ -1274,7 +1275,7 @@ struct mlx5_flow_meter *
/* Free meter flow table. */
mlx5_flow_destroy_policer_rules(dev, fm, &attr);
mlx5_flow_destroy_mtr_tbls(dev, fm->mfts);
- rte_free(fm);
+ mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], fm->idx);
}
TAILQ_FOREACH_SAFE(fmp, fmps, next, tmp) {
/* Check unused. */