#include <rte_mtr_driver.h>
#include <mlx5_devx_cmds.h>
+#include <mlx5_malloc.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;
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
memset(cap, 0, sizeof(*cap));
cap->n_max = 1 << qattr->log_max_flow_meter;
cap->n_shared_max = cap->n_max;
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Check input params. */
ret = mlx5_flow_meter_profile_validate(dev, meter_profile_id,
profile, error);
if (ret)
return ret;
/* Meter profile memory allocation. */
- fmp = rte_calloc(__func__, 1, sizeof(struct mlx5_flow_meter_profile),
- RTE_CACHE_LINE_SIZE);
+ fmp = mlx5_malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_flow_meter_profile),
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
if (fmp == NULL)
return -rte_mtr_error_set(error, ENOMEM,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
TAILQ_INSERT_TAIL(fmps, fmp, next);
return 0;
error:
- rte_free(fmp);
+ mlx5_free(fmp);
return ret;
}
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter profile must exist. */
fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id);
if (fmp == NULL)
return -rte_mtr_error_set(error, ENOENT,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
&meter_profile_id,
- "Meter profile id invalid.");
+ "Meter profile id is invalid.");
/* Check profile is unused. */
if (fmp->ref_cnt)
return -rte_mtr_error_set(error, EBUSY,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
- NULL, "Meter profile in use.");
+ NULL, "Meter profile is in use.");
/* Remove from list. */
TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next);
- rte_free(fmp);
+ mlx5_free(fmp);
return 0;
}
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Validate the parameters. */
ret = mlx5_flow_meter_validate(priv, meter_id, params, error);
if (ret)
/* 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);
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter object must exist. */
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL)
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter object must exist. */
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL)
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter object must exist. */
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL)
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter profile must exist. */
fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id);
if (fmp == NULL)
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter object must exist. */
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL)
if (!priv->mtr_en)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter is not support");
+ "Meter is not supported");
/* Meter object must exist. */
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL)
&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;
}
}
if (!fm->ref_cnt++) {
MLX5_ASSERT(!fm->mfts->meter_action);
- fm->attr = *attr;
+ 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);
goto error_detach;
} else {
MLX5_ASSERT(fm->mfts->meter_action);
- if (attr->transfer != fm->attr.transfer ||
- attr->ingress != fm->attr.ingress ||
- attr->egress != fm->attr.egress) {
+ 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 };
-
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
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;
+#else
+ (void)fm;
+#endif
}
/**
MLX5_ASSERT(!fmp->ref_cnt);
/* Remove from list. */
TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next);
- rte_free(fmp);
+ mlx5_free(fmp);
}
return 0;
}