*/
#include <math.h>
+#include <rte_tailq.h>
#include <rte_malloc.h>
#include <rte_mtr.h>
#include <rte_mtr_driver.h>
+#include <mlx5_devx_cmds.h>
+
#include "mlx5.h"
#include "mlx5_flow.h"
MLX5_SET(flow_meter_parameters,
attr, ebs_mantissa, srtcm->ebs_mantissa);
mtr_init.next_table =
- fm->attr.transfer ? fm->mfts->transfer.tbl->obj :
- fm->attr.egress ? fm->mfts->egress.tbl->obj :
+ fm->transfer ? fm->mfts->transfer.tbl->obj :
+ fm->egress ? fm->mfts->egress.tbl->obj :
fm->mfts->ingress.tbl->obj;
mtr_init.reg_c_index = priv->mtr_color_reg - REG_C_0;
mtr_init.flow_meter_parameter = fm->mfts->fmp;
};
int ret;
unsigned int i;
+ uint32_t idx = 0;
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
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;
- fm->params = *params;
+ memcpy(fm->action, params->action, sizeof(params->action));
+ fm->stats_mask = params->stats_mask;
+
/* Alloc policer counters. */
for (i = 0; i < RTE_DIM(fm->policer_stats.cnt); i++) {
fm->policer_stats.cnt[i] = mlx5_counter_alloc(dev);
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.");
NULL, "Meter object is being used.");
/* Get the meter profile. */
fmp = fm->profile;
- RTE_ASSERT(fmp);
+ MLX5_ASSERT(fmp);
/* Update dependencies. */
fmp->ref_cnt--;
/* Remove from the flow meter list. */
/* 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;
}
&bytes);
if (ret)
goto error;
- if (fm->params.action[i] == MTR_POLICER_ACTION_DROP) {
+ if (fm->action[i] == MTR_POLICER_ACTION_DROP) {
pkts_dropped += pkts;
bytes_dropped += bytes;
}
goto error;
}
if (!fm->ref_cnt++) {
- RTE_ASSERT(!fm->mfts->meter_action);
- fm->attr = *attr;
+ MLX5_ASSERT(!fm->mfts->meter_action);
+ fm->ingress = attr->ingress;
+ fm->egress = attr->egress;
+ fm->transfer = attr->transfer;
/* This also creates the meter object. */
fm->mfts->meter_action = mlx5_flow_meter_action_create(priv,
fm);
if (!fm->mfts->meter_action)
goto error_detach;
} else {
- RTE_ASSERT(fm->mfts->meter_action);
- if (attr->transfer != fm->attr.transfer ||
- attr->ingress != fm->attr.ingress ||
- attr->egress != fm->attr.egress) {
+ MLX5_ASSERT(fm->mfts->meter_action);
+ if (attr->transfer != fm->transfer ||
+ attr->ingress != fm->ingress ||
+ attr->egress != fm->egress) {
DRV_LOG(ERR, "meter I/O attributes do not "
"match flow I/O attributes.");
goto error_detach;
void
mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
{
- const struct rte_flow_attr attr = { 0 };
-
- RTE_ASSERT(fm->ref_cnt);
+ MLX5_ASSERT(fm->ref_cnt);
if (--fm->ref_cnt)
return;
if (fm->mfts->meter_action)
mlx5_glue->destroy_flow_action(fm->mfts->meter_action);
fm->mfts->meter_action = NULL;
- fm->attr = attr;
+ fm->ingress = 0;
+ fm->egress = 0;
+ fm->transfer = 0;
+}
+
+/**
+ * Flush meter configuration.
+ *
+ * @param[in] dev
+ * Pointer to Ethernet device.
+ * @param[out] error
+ * Pointer to rte meter error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_flow_meters *fms = &priv->flow_meters;
+ struct mlx5_mtr_profiles *fmps = &priv->flow_meter_profiles;
+ struct mlx5_flow_meter_profile *fmp;
+ struct mlx5_flow_meter *fm;
+ const struct rte_flow_attr attr = {
+ .ingress = 1,
+ .egress = 1,
+ .transfer = priv->config.dv_esw_en ? 1 : 0,
+ };
+ void *tmp;
+ uint32_t i;
+
+ TAILQ_FOREACH_SAFE(fm, fms, next, tmp) {
+ /* Meter object must not have any owner. */
+ MLX5_ASSERT(!fm->ref_cnt);
+ /* Get meter profile. */
+ fmp = fm->profile;
+ if (fmp == NULL)
+ return -rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+ NULL, "MTR object meter profile invalid.");
+ /* Update dependencies. */
+ fmp->ref_cnt--;
+ /* Remove from list. */
+ TAILQ_REMOVE(fms, fm, next);
+ /* Free policer counters. */
+ 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]);
+ /* Free meter flow table. */
+ mlx5_flow_destroy_policer_rules(dev, fm, &attr);
+ mlx5_flow_destroy_mtr_tbls(dev, fm->mfts);
+ mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], fm->idx);
+ }
+ TAILQ_FOREACH_SAFE(fmp, fmps, next, tmp) {
+ /* Check unused. */
+ MLX5_ASSERT(!fmp->ref_cnt);
+ /* Remove from list. */
+ TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next);
+ rte_free(fmp);
+ }
+ return 0;
}
git.droids-corp.org / dpdk.git / blobdiff