#include <rte_mtr_driver.h>
#include <mlx5_devx_cmds.h>
+#include <mlx5_malloc.h>
#include "mlx5.h"
#include "mlx5_flow.h"
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)
fm->shared = !!shared;
fm->policer_stats.stats_mask = params->stats_mask;
fm->profile->ref_cnt++;
+ rte_spinlock_init(&fm->sl);
return 0;
error:
mlx5_flow_destroy_policer_rules(dev, fm, &attr);
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)
struct rte_flow_error *error)
{
struct mlx5_flow_meter *fm;
+ int ret = 0;
fm = mlx5_flow_meter_find(priv, meter_id);
if (fm == NULL) {
rte_flow_error_set(error, ENOENT,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"Meter object id not valid");
- goto error;
- }
- if (!fm->shared && fm->ref_cnt) {
- DRV_LOG(ERR, "Cannot share a non-shared meter.");
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
- "Meter can't be shared");
- goto error;
+ return fm;
}
- if (!fm->ref_cnt++) {
- MLX5_ASSERT(!fm->mfts->meter_action);
+ rte_spinlock_lock(&fm->sl);
+ if (fm->mfts->meter_action) {
+ if (fm->shared &&
+ attr->transfer == fm->transfer &&
+ attr->ingress == fm->ingress &&
+ attr->egress == fm->egress)
+ fm->ref_cnt++;
+ else
+ ret = -1;
+ } else {
fm->ingress = attr->ingress;
fm->egress = attr->egress;
fm->transfer = attr->transfer;
+ fm->ref_cnt = 1;
/* 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 {
- 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;
+ if (!fm->mfts->meter_action) {
+ fm->ref_cnt = 0;
+ fm->ingress = 0;
+ fm->egress = 0;
+ fm->transfer = 0;
+ ret = -1;
+ DRV_LOG(ERR, "Meter action create failed.");
}
}
- return fm;
-error_detach:
- mlx5_flow_meter_detach(fm);
- rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
- fm->mfts->meter_action ? "Meter attr not match" :
- "Meter action create failed");
-error:
- return NULL;
+ rte_spinlock_unlock(&fm->sl);
+ if (ret)
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+ fm->mfts->meter_action ?
+ "Meter attr not match" :
+ "Meter action create failed");
+ return ret ? NULL : fm;
}
/**
void
mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
{
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
+ rte_spinlock_lock(&fm->sl);
MLX5_ASSERT(fm->ref_cnt);
- if (--fm->ref_cnt)
- return;
- if (fm->mfts->meter_action)
+ if (--fm->ref_cnt == 0) {
mlx5_glue->destroy_flow_action(fm->mfts->meter_action);
- fm->mfts->meter_action = NULL;
- fm->ingress = 0;
- fm->egress = 0;
- fm->transfer = 0;
+ fm->mfts->meter_action = NULL;
+ fm->ingress = 0;
+ fm->egress = 0;
+ fm->transfer = 0;
+ }
+ rte_spinlock_unlock(&fm->sl);
+#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;
}