net/mlx5: initialize flow meter ASO SQ
[dpdk.git] / drivers / net / mlx5 / mlx5_flow_meter.c
index 7645d92..ef4ca30 100644 (file)
@@ -4,13 +4,76 @@
  */
 #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_malloc.h>
+
 #include "mlx5.h"
 #include "mlx5_flow.h"
 
+/**
+ * Create the meter action.
+ *
+ * @param priv
+ *   Pointer to mlx5_priv.
+ * @param[in] fm
+ *   Pointer to flow meter to be converted.
+ *
+ * @return
+ *   Pointer to the meter action on success, NULL otherwise.
+ */
+static void *
+mlx5_flow_meter_action_create(struct mlx5_priv *priv,
+                             struct mlx5_flow_meter_info *fm)
+{
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
+       struct mlx5dv_dr_flow_meter_attr mtr_init;
+       uint32_t fmp[MLX5_ST_SZ_DW(flow_meter_parameters)];
+       struct mlx5_flow_meter_srtcm_rfc2697_prm *srtcm =
+                                                    &fm->profile->srtcm_prm;
+       uint32_t cbs_cir = rte_be_to_cpu_32(srtcm->cbs_cir);
+       uint32_t ebs_eir = rte_be_to_cpu_32(srtcm->ebs_eir);
+       uint32_t val;
+
+       memset(fmp, 0, MLX5_ST_SZ_BYTES(flow_meter_parameters));
+       MLX5_SET(flow_meter_parameters, fmp, valid, 1);
+       MLX5_SET(flow_meter_parameters, fmp, bucket_overflow, 1);
+       MLX5_SET(flow_meter_parameters, fmp,
+               start_color, MLX5_FLOW_COLOR_GREEN);
+       MLX5_SET(flow_meter_parameters, fmp, both_buckets_on_green, 0);
+       val = (cbs_cir >> ASO_DSEG_CBS_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+       MLX5_SET(flow_meter_parameters, fmp, cbs_exponent, val);
+       val = (cbs_cir >> ASO_DSEG_CBS_MAN_OFFSET) & ASO_DSEG_MAN_MASK;
+       MLX5_SET(flow_meter_parameters, fmp, cbs_mantissa, val);
+       val = (cbs_cir >> ASO_DSEG_CIR_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+       MLX5_SET(flow_meter_parameters, fmp, cir_exponent, val);
+       val = (cbs_cir & ASO_DSEG_MAN_MASK);
+       MLX5_SET(flow_meter_parameters, fmp, cir_mantissa, val);
+       val = (ebs_eir >> ASO_DSEG_EBS_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+       MLX5_SET(flow_meter_parameters, fmp, ebs_exponent, val);
+       val = (ebs_eir >> ASO_DSEG_EBS_MAN_OFFSET) & ASO_DSEG_MAN_MASK;
+       MLX5_SET(flow_meter_parameters, fmp, ebs_mantissa, val);
+       mtr_init.next_table =
+               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 = fmp;
+       mtr_init.flow_meter_parameter_sz =
+               MLX5_ST_SZ_BYTES(flow_meter_parameters);
+       mtr_init.active = fm->active_state;
+       return mlx5_glue->dv_create_flow_action_meter(&mtr_init);
+#else
+       (void)priv;
+       (void)fm;
+       return NULL;
+#endif
+}
+
 /**
  * Find meter profile by id.
  *
@@ -29,7 +92,7 @@ mlx5_flow_meter_profile_find(struct mlx5_priv *priv, uint32_t meter_profile_id)
        struct mlx5_flow_meter_profile *fmp;
 
        TAILQ_FOREACH(fmp, fmps, next)
-               if (meter_profile_id == fmp->meter_profile_id)
+               if (meter_profile_id == fmp->id)
                        return fmp;
        return NULL;
 }
@@ -76,7 +139,7 @@ mlx5_flow_meter_profile_validate(struct rte_eth_dev *dev,
                                          NULL,
                                          "Meter profile already exists.");
        if (profile->alg == RTE_MTR_SRTCM_RFC2697) {
-               if (priv->config.hca_attr.qos.srtcm_sup) {
+               if (priv->config.hca_attr.qos.flow_meter_old) {
                        /* Verify support for flow meter parameters. */
                        if (profile->srtcm_rfc2697.cir > 0 &&
                            profile->srtcm_rfc2697.cir <= MLX5_SRTCM_CIR_MAX &&
@@ -179,44 +242,51 @@ mlx5_flow_meter_param_fill(struct mlx5_flow_meter_profile *fmp,
 {
        struct mlx5_flow_meter_srtcm_rfc2697_prm *srtcm = &fmp->srtcm_prm;
        uint8_t man, exp;
+       uint32_t cbs_exp, cbs_man, cir_exp, cir_man;
+       uint32_t ebs_exp, ebs_man;
 
        if (fmp->profile.alg != RTE_MTR_SRTCM_RFC2697)
                return -rte_mtr_error_set(error, ENOTSUP,
                                RTE_MTR_ERROR_TYPE_METER_PROFILE,
                                NULL, "Metering algorithm not supported.");
+       /* cir = 8G * cir_mantissa * 1/(2^cir_exponent)) Bytes/Sec */
+       mlx5_flow_meter_cir_man_exp_calc(fmp->profile.srtcm_rfc2697.cir,
+                                   &man, &exp);
+       /* Check if cir mantissa is too large. */
+       if (exp > ASO_DSEG_CIR_EXP_MASK)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+                                         "meter profile parameter cir is"
+                                         " not supported.");
+       cir_man = man;
+       cir_exp = exp;
         /* cbs = cbs_mantissa * 2^cbs_exponent */
        mlx5_flow_meter_xbs_man_exp_calc(fmp->profile.srtcm_rfc2697.cbs,
                                    &man, &exp);
-       srtcm->cbs_mantissa = man;
-       srtcm->cbs_exponent = exp;
        /* Check if cbs mantissa is too large. */
-       if (srtcm->cbs_exponent != exp)
-               return -rte_mtr_error_set(error, EINVAL,
+       if (exp > ASO_DSEG_EXP_MASK)
+               return -rte_mtr_error_set(error, ENOTSUP,
                                          RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
-                                         "Metering profile parameter cbs is"
-                                         " invalid.");
-       /* ebs = ebs_mantissa * 2^ebs_exponent */
+                                         "meter profile parameter cbs is"
+                                         " not supported.");
+       cbs_man = man;
+       cbs_exp = exp;
+       srtcm->cbs_cir = rte_cpu_to_be_32(cbs_exp << ASO_DSEG_CBS_EXP_OFFSET |
+                               cbs_man << ASO_DSEG_CBS_MAN_OFFSET |
+                               cir_exp << ASO_DSEG_CIR_EXP_OFFSET |
+                               cir_man);
        mlx5_flow_meter_xbs_man_exp_calc(fmp->profile.srtcm_rfc2697.ebs,
                                    &man, &exp);
-       srtcm->ebs_mantissa = man;
-       srtcm->ebs_exponent = exp;
        /* Check if ebs mantissa is too large. */
-       if (srtcm->ebs_exponent != exp)
-               return -rte_mtr_error_set(error, EINVAL,
-                                         RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
-                                         "Metering profile parameter ebs is"
-                                         " invalid.");
-       /* cir = 8G * cir_mantissa * 1/(2^cir_exponent)) Bytes/Sec */
-       mlx5_flow_meter_cir_man_exp_calc(fmp->profile.srtcm_rfc2697.cir,
-                                   &man, &exp);
-       srtcm->cir_mantissa = man;
-       srtcm->cir_exponent = exp;
-       /* Check if cir mantissa is too large. */
-       if (srtcm->cir_exponent != exp)
-               return -rte_mtr_error_set(error, EINVAL,
+       if (exp > ASO_DSEG_EXP_MASK)
+               return -rte_mtr_error_set(error, ENOTSUP,
                                          RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
-                                         "Metering profile parameter cir is"
-                                         " invalid.");
+                                         "meter profile parameter ebs is"
+                                         " not supported.");
+       ebs_man = man;
+       ebs_exp = exp;
+       srtcm->ebs_eir = rte_cpu_to_be_32(ebs_exp << ASO_DSEG_EBS_EXP_OFFSET |
+                                       ebs_man << ASO_DSEG_EBS_MAN_OFFSET);
        return 0;
 }
 
@@ -244,16 +314,20 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *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");
        memset(cap, 0, sizeof(*cap));
-       cap->n_max = 1 << qattr->log_max_flow_meter;
+       if (priv->sh->meter_aso_en)
+           /* 2 meters per one ASO cache line. */
+               cap->n_max = 1 << (qattr->log_max_num_meter_aso + 1);
+       else
+               cap->n_max = 1 << qattr->log_max_flow_meter;
        cap->n_shared_max = cap->n_max;
        cap->identical = 1;
        cap->shared_identical = 1;
        cap->shared_n_flows_per_mtr_max = 4 << 20;
        /* 2M flows can share the same meter. */
        cap->chaining_n_mtrs_per_flow_max = 1; /* Chaining is not supported. */
-       cap->meter_srtcm_rfc2697_n_max = qattr->srtcm_sup ? cap->n_max : 0;
+       cap->meter_srtcm_rfc2697_n_max = qattr->flow_meter_old ? cap->n_max : 0;
        cap->meter_rate_max = 1ULL << 40; /* 1 Tera tokens per sec. */
        cap->policer_action_drop_supported = 1;
        cap->stats_mask = RTE_MTR_STATS_N_BYTES_DROPPED |
@@ -290,22 +364,22 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *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");
        /* 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,
                                          NULL, "Meter profile memory "
                                          "alloc failed.");
        /* Fill profile info. */
-       fmp->meter_profile_id = meter_profile_id;
+       fmp->id = meter_profile_id;
        fmp->profile = *profile;
        /* Fill the flow meter parameters for the PRM. */
        ret = mlx5_flow_meter_param_fill(fmp, error);
@@ -315,7 +389,7 @@ mlx5_flow_meter_profile_add(struct rte_eth_dev *dev,
        TAILQ_INSERT_TAIL(fmps, fmp, next);
        return 0;
 error:
-       rte_free(fmp);
+       mlx5_free(fmp);
        return ret;
 }
 
@@ -343,22 +417,22 @@ mlx5_flow_meter_profile_delete(struct rte_eth_dev *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 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;
 }
 
@@ -407,13 +481,12 @@ mlx5_flow_meter_validate(struct mlx5_priv *priv, uint32_t meter_id,
                         struct rte_mtr_params *params,
                         struct rte_mtr_error *error)
 {
-       static enum rte_mtr_policer_action
-                               valid_recol_action[RTE_COLORS] = {
-                                              MTR_POLICER_ACTION_COLOR_GREEN,
-                                              MTR_POLICER_ACTION_COLOR_YELLOW,
-                                              MTR_POLICER_ACTION_COLOR_RED };
-       int i;
-
+       /* Meter must use global drop action. */
+       if (!priv->sh->dr_drop_action)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_MTR_PARAMS,
+                                         NULL,
+                                         "No drop action ready for meter.");
        /* Meter params must not be NULL. */
        if (params == NULL)
                return -rte_mtr_error_set(error, EINVAL,
@@ -427,15 +500,20 @@ mlx5_flow_meter_validate(struct mlx5_priv *priv, uint32_t meter_id,
                                          "Previous meter color "
                                          "not supported.");
        /* Validate policer settings. */
-       for (i = 0; i < RTE_COLORS; i++)
-               if (params->action[i] != valid_recol_action[i] &&
-                   params->action[i] != MTR_POLICER_ACTION_DROP)
-                       return -rte_mtr_error_set
-                                       (error, ENOTSUP,
-                                        action2error(params->action[i]), NULL,
-                                        "Recolor action not supported.");
+       if (params->action[RTE_COLOR_RED] != MTR_POLICER_ACTION_DROP)
+               return -rte_mtr_error_set
+                               (error, ENOTSUP,
+                                action2error(params->action[RTE_COLOR_RED]),
+                                NULL,
+                                "Red color only supports drop action.");
+       if (params->action[RTE_COLOR_GREEN] != MTR_POLICER_ACTION_COLOR_GREEN)
+               return -rte_mtr_error_set
+                               (error, ENOTSUP,
+                                action2error(params->action[RTE_COLOR_GREEN]),
+                                NULL,
+                                "Green color only supports recolor green action.");
        /* Validate meter id. */
-       if (mlx5_flow_meter_find(priv, meter_id))
+       if (mlx5_flow_meter_find(priv, meter_id, NULL))
                return -rte_mtr_error_set(error, EEXIST,
                                          RTE_MTR_ERROR_TYPE_MTR_ID, NULL,
                                          "Meter object already exists.");
@@ -460,7 +538,7 @@ mlx5_flow_meter_validate(struct mlx5_priv *priv, uint32_t meter_id,
  */
 static int
 mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
-               struct mlx5_flow_meter *fm,
+               struct mlx5_flow_meter_info *fm,
                const struct mlx5_flow_meter_srtcm_rfc2697_prm *srtcm,
                uint64_t modify_bits, uint32_t active_state)
 {
@@ -469,33 +547,37 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
        uint32_t *attr;
        struct mlx5dv_dr_flow_meter_attr mod_attr = { 0 };
        int ret;
+       uint32_t cbs_cir, ebs_eir, val;
 
        /* Fill command parameters. */
        mod_attr.reg_c_index = priv->mtr_color_reg - REG_C_0;
        mod_attr.flow_meter_parameter = in;
-       mod_attr.flow_meter_parameter_sz = fm->mfts->fmp_size;
+       mod_attr.flow_meter_parameter_sz =
+                               MLX5_ST_SZ_BYTES(flow_meter_parameters);
        if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_ACTIVE)
                mod_attr.active = !!active_state;
        else
                mod_attr.active = 0;
        attr = in;
+       cbs_cir = rte_be_to_cpu_32(srtcm->cbs_cir);
+       ebs_eir = rte_be_to_cpu_32(srtcm->ebs_eir);
        if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CBS) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, cbs_exponent, srtcm->cbs_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, cbs_mantissa, srtcm->cbs_mantissa);
+               val = (cbs_cir >> ASO_DSEG_CBS_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+               MLX5_SET(flow_meter_parameters, attr, cbs_exponent, val);
+               val = (cbs_cir >> ASO_DSEG_CBS_MAN_OFFSET) & ASO_DSEG_MAN_MASK;
+               MLX5_SET(flow_meter_parameters, attr, cbs_mantissa, val);
        }
        if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CIR) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, cir_exponent, srtcm->cir_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, cir_mantissa, srtcm->cir_mantissa);
+               val = (cbs_cir >> ASO_DSEG_CIR_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+               MLX5_SET(flow_meter_parameters, attr, cir_exponent, val);
+               val = cbs_cir & ASO_DSEG_MAN_MASK;
+               MLX5_SET(flow_meter_parameters, attr, cir_mantissa, val);
        }
        if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_EBS) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, ebs_exponent, srtcm->ebs_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, ebs_mantissa, srtcm->ebs_mantissa);
+               val = (ebs_eir >> ASO_DSEG_EBS_EXP_OFFSET) & ASO_DSEG_EXP_MASK;
+               MLX5_SET(flow_meter_parameters, attr, ebs_exponent, val);
+               val = (ebs_eir >> ASO_DSEG_EBS_MAN_OFFSET) & ASO_DSEG_MAN_MASK;
+               MLX5_SET(flow_meter_parameters, attr, ebs_mantissa, val);
        }
        /* Apply modifications to meter only if it was created. */
        if (fm->mfts->meter_action) {
@@ -508,26 +590,6 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
        /* Update succeedded modify meter parameters. */
        if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_ACTIVE)
                fm->active_state = !!active_state;
-       attr = fm->mfts->fmp;
-       if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CBS) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, cbs_exponent, srtcm->cbs_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, cbs_mantissa, srtcm->cbs_mantissa);
-       }
-       if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CIR) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, cir_exponent, srtcm->cir_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, cir_mantissa, srtcm->cir_mantissa);
-       }
-       if (modify_bits & MLX5_FLOW_METER_OBJ_MODIFY_FIELD_EBS) {
-               MLX5_SET(flow_meter_parameters,
-                        attr, ebs_exponent, srtcm->ebs_exponent);
-               MLX5_SET(flow_meter_parameters,
-                        attr, ebs_mantissa, srtcm->ebs_mantissa);
-       }
-
        return 0;
 #else
        (void)priv;
@@ -539,6 +601,19 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
 #endif
 }
 
+static void
+mlx5_flow_meter_stats_enable_update(struct mlx5_flow_meter_info *fm,
+                               uint64_t stats_mask)
+{
+       fm->green_bytes = (stats_mask & RTE_MTR_STATS_N_BYTES_GREEN) ? 1 : 0;
+       fm->green_pkts = (stats_mask & RTE_MTR_STATS_N_PKTS_GREEN) ? 1 : 0;
+       fm->red_bytes = (stats_mask & RTE_MTR_STATS_N_BYTES_RED) ? 1 : 0;
+       fm->red_pkts = (stats_mask & RTE_MTR_STATS_N_PKTS_RED) ? 1 : 0;
+       fm->bytes_dropped =
+               (stats_mask & RTE_MTR_STATS_N_BYTES_DROPPED) ? 1 : 0;
+       fm->pkts_dropped = (stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED) ? 1 : 0;
+}
+
 /**
  * Create meter rules.
  *
@@ -562,21 +637,32 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
                       struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flow_meters *fms = &priv->flow_meters;
+       struct mlx5_legacy_flow_meters *fms = &priv->flow_meters;
        struct mlx5_flow_meter_profile *fmp;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_legacy_flow_meter *legacy_fm;
+       struct mlx5_flow_meter_info *fm;
        const struct rte_flow_attr attr = {
                                .ingress = 1,
                                .egress = 1,
                                .transfer = priv->config.dv_esw_en ? 1 : 0,
                        };
+       struct mlx5_indexed_pool_config flow_ipool_cfg = {
+               .size = 0,
+               .trunk_size = 64,
+               .need_lock = 1,
+               .type = "mlx5_flow_mtr_flow_id_pool",
+       };
+       struct mlx5_aso_mtr *aso_mtr;
+       uint32_t mtr_idx;
        int ret;
-       unsigned int i;
+       uint8_t mtr_id_bits;
+       uint8_t mtr_reg_bits = priv->mtr_reg_share ?
+                               MLX5_MTR_IDLE_BITS_IN_COLOR_REG : MLX5_REG_BITS;
 
        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)
@@ -588,47 +674,125 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id,
                                          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);
-       if (fm == NULL)
-               return -rte_mtr_error_set(error, ENOMEM,
-                                         RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
-                                         "Memory alloc failed for meter.");
+       if (priv->sh->meter_aso_en) {
+               mtr_idx = mlx5_flow_mtr_alloc(dev);
+               if (!mtr_idx)
+                       return -rte_mtr_error_set(error, ENOMEM,
+                               RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                               "Memory alloc failed for meter.");
+               aso_mtr = mlx5_aso_meter_by_idx(priv, mtr_idx);
+               fm = &aso_mtr->fm;
+       } else {
+               legacy_fm = mlx5_ipool_zmalloc
+                               (priv->sh->ipool[MLX5_IPOOL_MTR], &mtr_idx);
+               if (legacy_fm == NULL)
+                       return -rte_mtr_error_set(error, ENOMEM,
+                               RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                               "Memory alloc failed for meter.");
+               legacy_fm->idx = mtr_idx;
+               fm = &legacy_fm->fm;
+       }
+       mtr_id_bits = MLX5_REG_BITS - __builtin_clz(mtr_idx);
+       if ((mtr_id_bits + priv->max_mtr_flow_bits) > mtr_reg_bits) {
+               DRV_LOG(ERR, "Meter number exceeds max limit.");
+               goto error;
+       }
+       if (mtr_id_bits > priv->max_mtr_bits)
+               priv->max_mtr_bits = mtr_id_bits;
        /* Fill the flow meter parameters. */
        fm->meter_id = meter_id;
        fm->profile = fmp;
-       fm->params = *params;
+       memcpy(fm->action, params->action, sizeof(params->action));
+       mlx5_flow_meter_stats_enable_update(fm, 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 (!fm->policer_stats.cnt[i])
+       if (fm->green_bytes || fm->green_pkts) {
+               fm->policer_stats.pass_cnt = mlx5_counter_alloc(dev);
+               if (!fm->policer_stats.pass_cnt)
                        goto error;
        }
-       fm->mfts = mlx5_flow_create_mtr_tbls(dev, fm);
+       if (fm->red_bytes || fm->red_pkts ||
+           fm->bytes_dropped || fm->pkts_dropped) {
+               fm->policer_stats.drop_cnt = mlx5_counter_alloc(dev);
+               if (!fm->policer_stats.drop_cnt)
+                       goto error;
+       }
+       fm->mfts = mlx5_flow_create_mtr_tbls(dev);
        if (!fm->mfts)
                goto error;
-       ret = mlx5_flow_create_policer_rules(dev, fm, &attr);
+       ret = mlx5_flow_prepare_policer_rules(dev, fm, &attr);
        if (ret)
                goto error;
        /* Add to the flow meter list. */
-       TAILQ_INSERT_TAIL(fms, fm, next);
+       if (!priv->sh->meter_aso_en)
+               TAILQ_INSERT_TAIL(fms, legacy_fm, next);
        fm->active_state = 1; /* Config meter starts as active. */
        fm->shared = !!shared;
-       fm->profile->ref_cnt++;
+       __atomic_add_fetch(&fm->profile->ref_cnt, 1, __ATOMIC_RELAXED);
+       fm->flow_ipool = mlx5_ipool_create(&flow_ipool_cfg);
+       if (!fm->flow_ipool)
+               goto error;
+       rte_spinlock_init(&fm->sl);
        return 0;
 error:
        mlx5_flow_destroy_policer_rules(dev, fm, &attr);
        mlx5_flow_destroy_mtr_tbls(dev, fm->mfts);
        /* 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]);
-       rte_free(fm);
+       if (fm->policer_stats.pass_cnt)
+               mlx5_counter_free(dev, fm->policer_stats.pass_cnt);
+       if (fm->policer_stats.drop_cnt)
+               mlx5_counter_free(dev, fm->policer_stats.drop_cnt);
+       if (priv->sh->meter_aso_en)
+               mlx5_flow_mtr_free(dev, mtr_idx);
+       else
+               mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], mtr_idx);
        return -rte_mtr_error_set(error, -ret,
                                  RTE_MTR_ERROR_TYPE_UNSPECIFIED,
                                  NULL, "Failed to create devx meter.");
 }
 
+static int
+mlx5_flow_meter_params_flush(struct rte_eth_dev *dev,
+                       struct mlx5_flow_meter_info *fm,
+                       const struct rte_flow_attr *attr,
+                       uint32_t mtr_idx)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_legacy_flow_meters *fms = &priv->flow_meters;
+       struct mlx5_flow_meter_profile *fmp;
+       struct mlx5_legacy_flow_meter *legacy_fm = NULL;
+
+       /* Meter object must not have any owner. */
+       MLX5_ASSERT(!fm->ref_cnt);
+       /* Get meter profile. */
+       fmp = fm->profile;
+       if (fmp == NULL)
+               return -1;
+       /* Update dependencies. */
+       __atomic_sub_fetch(&fmp->ref_cnt, 1, __ATOMIC_RELAXED);
+       /* Remove from list. */
+       if (!priv->sh->meter_aso_en) {
+               legacy_fm = container_of(fm, struct mlx5_legacy_flow_meter, fm);
+               TAILQ_REMOVE(fms, legacy_fm, next);
+       }
+       /* Free policer counters. */
+       if (fm->policer_stats.pass_cnt)
+               mlx5_counter_free(dev, fm->policer_stats.pass_cnt);
+       if (fm->policer_stats.drop_cnt)
+               mlx5_counter_free(dev, fm->policer_stats.drop_cnt);
+       /* Free meter flow table. */
+       if (fm->flow_ipool)
+               mlx5_ipool_destroy(fm->flow_ipool);
+       mlx5_flow_destroy_policer_rules(dev, fm, attr);
+       mlx5_flow_destroy_mtr_tbls(dev, fm->mfts);
+       if (priv->sh->meter_aso_en)
+               mlx5_flow_mtr_free(dev, mtr_idx);
+       else
+               mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR],
+                                       legacy_fm->idx);
+       return 0;
+}
+
 /**
  * Destroy meter rules.
  *
@@ -647,22 +811,20 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id,
                        struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flow_meters *fms = &priv->flow_meters;
-       struct mlx5_flow_meter_profile *fmp;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_flow_meter_info *fm;
        const struct rte_flow_attr attr = {
                                .ingress = 1,
                                .egress = 1,
                                .transfer = priv->config.dv_esw_en ? 1 : 0,
                        };
-       unsigned int i;
+       uint32_t mtr_idx = 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");
        /* Meter object must exist. */
-       fm = mlx5_flow_meter_find(priv, meter_id);
+       fm = mlx5_flow_meter_find(priv, meter_id, &mtr_idx);
        if (fm == NULL)
                return -rte_mtr_error_set(error, ENOENT,
                                          RTE_MTR_ERROR_TYPE_MTR_ID,
@@ -672,21 +834,17 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id,
                return -rte_mtr_error_set(error, EBUSY,
                                          RTE_MTR_ERROR_TYPE_UNSPECIFIED,
                                          NULL, "Meter object is being used.");
-       /* Get the meter profile. */
-       fmp = fm->profile;
-       RTE_ASSERT(fmp);
-       /* Update dependencies. */
-       fmp->ref_cnt--;
-       /* Remove from the flow meter 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);
-       rte_free(fm);
+       if (priv->sh->meter_aso_en) {
+               if (mlx5_l3t_clear_entry(priv->mtr_idx_tbl, meter_id))
+                       return -rte_mtr_error_set(error, EBUSY,
+                               RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                               "Fail to delete ASO Meter in index table.");
+       }
+       /* Destroy the meter profile. */
+       if (mlx5_flow_meter_params_flush(dev, fm, &attr, mtr_idx))
+               return -rte_mtr_error_set(error, EINVAL,
+                                       RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+                                       NULL, "MTR object meter profile invalid.");
        return 0;
 }
 
@@ -707,17 +865,13 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id,
  */
 static int
 mlx5_flow_meter_modify_state(struct mlx5_priv *priv,
-                            struct mlx5_flow_meter *fm,
+                            struct mlx5_flow_meter_info *fm,
                             uint32_t new_state,
                             struct rte_mtr_error *error)
 {
        static const struct mlx5_flow_meter_srtcm_rfc2697_prm srtcm = {
-               .cbs_exponent = 20,
-               .cbs_mantissa = 191,
-               .cir_exponent = 0,
-               .cir_mantissa = 200,
-               .ebs_exponent = 0,
-               .ebs_mantissa = 0,
+               .cbs_cir = RTE_BE32(MLX5_IFC_FLOW_METER_DISABLE_CBS_CIR_VAL),
+               .ebs_eir = 0,
        };
        uint64_t modify_bits = MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CBS |
                               MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CIR;
@@ -759,15 +913,15 @@ mlx5_flow_meter_enable(struct rte_eth_dev *dev,
                       struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_flow_meter_info *fm;
        int 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 object must exist. */
-       fm = mlx5_flow_meter_find(priv, meter_id);
+       fm = mlx5_flow_meter_find(priv, meter_id, NULL);
        if (fm == NULL)
                return -rte_mtr_error_set(error, ENOENT,
                                          RTE_MTR_ERROR_TYPE_MTR_ID,
@@ -800,15 +954,15 @@ mlx5_flow_meter_disable(struct rte_eth_dev *dev,
                        struct rte_mtr_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_flow_meter_info *fm;
        int 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 object must exist. */
-       fm = mlx5_flow_meter_find(priv, meter_id);
+       fm = mlx5_flow_meter_find(priv, meter_id, NULL);
        if (fm == NULL)
                return -rte_mtr_error_set(error, ENOENT,
                                          RTE_MTR_ERROR_TYPE_MTR_ID,
@@ -846,7 +1000,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_flow_meter_profile *fmp;
        struct mlx5_flow_meter_profile *old_fmp;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_flow_meter_info *fm;
        uint64_t modify_bits = MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CBS |
                               MLX5_FLOW_METER_OBJ_MODIFY_FIELD_CIR;
        int ret;
@@ -854,7 +1008,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *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 profile must exist. */
        fmp = mlx5_flow_meter_profile_find(priv, meter_profile_id);
        if (fmp == NULL)
@@ -862,7 +1016,7 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
                                          RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
                                          NULL, "Meter profile not found.");
        /* Meter object must exist. */
-       fm = mlx5_flow_meter_find(priv, meter_id);
+       fm = mlx5_flow_meter_find(priv, meter_id, NULL);
        if (fm == NULL)
                return -rte_mtr_error_set(error, ENOENT,
                                          RTE_MTR_ERROR_TYPE_MTR_ID,
@@ -890,6 +1044,203 @@ mlx5_flow_meter_profile_update(struct rte_eth_dev *dev,
        return 0;
 }
 
+/**
+ * Callback to update meter stats mask.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] meter_id
+ *   Meter id.
+ * @param[in] stats_mask
+ *   To be updated stats_mask.
+ * @param[out] error
+ *   Pointer to rte meter error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_flow_meter_stats_update(struct rte_eth_dev *dev,
+                            uint32_t meter_id,
+                            uint64_t stats_mask,
+                            struct rte_mtr_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_meter_info *fm;
+       const struct rte_flow_attr attr = {
+                               .ingress = 1,
+                               .egress = 1,
+                               .transfer = priv->config.dv_esw_en ? 1 : 0,
+                       };
+       bool need_updated = false;
+       struct mlx5_flow_policer_stats old_policer_stats;
+
+       if (!priv->mtr_en)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "Meter is not supported");
+       /* Meter object must exist. */
+       fm = mlx5_flow_meter_find(priv, meter_id, NULL);
+       if (fm == NULL)
+               return -rte_mtr_error_set(error, ENOENT,
+                                         RTE_MTR_ERROR_TYPE_MTR_ID,
+                                         NULL, "Meter object id not valid.");
+       old_policer_stats.pass_cnt = 0;
+       old_policer_stats.drop_cnt = 0;
+       if (!!((RTE_MTR_STATS_N_PKTS_GREEN |
+                               RTE_MTR_STATS_N_BYTES_GREEN) & stats_mask) !=
+               !!fm->policer_stats.pass_cnt) {
+               need_updated = true;
+               if (fm->policer_stats.pass_cnt) {
+                       old_policer_stats.pass_cnt = fm->policer_stats.pass_cnt;
+                       fm->policer_stats.pass_cnt = 0;
+               } else {
+                       fm->policer_stats.pass_cnt =
+                               mlx5_counter_alloc(dev);
+                       if (!fm->policer_stats.pass_cnt)
+                               return -rte_mtr_error_set(error, ENOMEM,
+                                         RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "Counter alloc failed for meter.");
+               }
+       }
+       if (!!((RTE_MTR_STATS_N_PKTS_RED | RTE_MTR_STATS_N_BYTES_RED |
+               RTE_MTR_STATS_N_PKTS_DROPPED | RTE_MTR_STATS_N_BYTES_DROPPED) &
+               stats_mask) !=
+               !!fm->policer_stats.drop_cnt) {
+               need_updated = true;
+               if (fm->policer_stats.drop_cnt) {
+                       old_policer_stats.drop_cnt = fm->policer_stats.drop_cnt;
+                       fm->policer_stats.drop_cnt = 0;
+               } else {
+                       fm->policer_stats.drop_cnt =
+                               mlx5_counter_alloc(dev);
+                       if (!fm->policer_stats.drop_cnt)
+                               return -rte_mtr_error_set(error, ENOMEM,
+                                         RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "Counter alloc failed for meter.");
+               }
+       }
+       if (need_updated) {
+               if (mlx5_flow_prepare_policer_rules(dev, fm, &attr)) {
+                       if (fm->policer_stats.pass_cnt &&
+                               fm->policer_stats.pass_cnt !=
+                               old_policer_stats.pass_cnt)
+                               mlx5_counter_free(dev,
+                                       fm->policer_stats.pass_cnt);
+                       fm->policer_stats.pass_cnt =
+                                       old_policer_stats.pass_cnt;
+                       if (fm->policer_stats.drop_cnt &&
+                               fm->policer_stats.drop_cnt !=
+                               old_policer_stats.drop_cnt)
+                               mlx5_counter_free(dev,
+                                       fm->policer_stats.drop_cnt);
+                       fm->policer_stats.pass_cnt =
+                                       old_policer_stats.pass_cnt;
+                       return -rte_mtr_error_set(error, ENOTSUP,
+                               RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+                               NULL, "Failed to create meter policer rules.");
+               }
+               /* Free old policer counters. */
+               if (old_policer_stats.pass_cnt)
+                       mlx5_counter_free(dev,
+                               old_policer_stats.pass_cnt);
+               if (old_policer_stats.drop_cnt)
+                       mlx5_counter_free(dev,
+                               old_policer_stats.drop_cnt);
+       }
+       mlx5_flow_meter_stats_enable_update(fm, stats_mask);
+       return 0;
+}
+
+/**
+ * Callback to read meter statistics.
+ *
+ * @param[in] dev
+ *   Pointer to Ethernet device.
+ * @param[in] meter_id
+ *   Meter id.
+ * @param[out] stats
+ *   Pointer to store the statistics.
+ * @param[out] stats_mask
+ *   Pointer to store the stats_mask.
+ * @param[in] clear
+ *   Statistic to be cleared after read or not.
+ * @param[out] error
+ *   Pointer to rte meter error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_flow_meter_stats_read(struct rte_eth_dev *dev,
+                          uint32_t meter_id,
+                          struct rte_mtr_stats *stats,
+                          uint64_t *stats_mask,
+                          int clear,
+                          struct rte_mtr_error *error)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_meter_info *fm;
+       struct mlx5_flow_policer_stats *ps;
+       uint64_t pkts;
+       uint64_t bytes;
+       int ret = 0;
+
+       if (!priv->mtr_en)
+               return -rte_mtr_error_set(error, ENOTSUP,
+                                         RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "Meter is not supported");
+       /* Meter object must exist. */
+       fm = mlx5_flow_meter_find(priv, meter_id, NULL);
+       if (fm == NULL)
+               return -rte_mtr_error_set(error, ENOENT,
+                                         RTE_MTR_ERROR_TYPE_MTR_ID,
+                                         NULL, "Meter object id not valid.");
+       ps = &fm->policer_stats;
+       *stats_mask = 0;
+       if (fm->green_bytes)
+               *stats_mask |= RTE_MTR_STATS_N_BYTES_GREEN;
+       if (fm->green_pkts)
+               *stats_mask |= RTE_MTR_STATS_N_PKTS_GREEN;
+       if (fm->red_bytes)
+               *stats_mask |= RTE_MTR_STATS_N_BYTES_RED;
+       if (fm->red_pkts)
+               *stats_mask |= RTE_MTR_STATS_N_PKTS_RED;
+       if (fm->bytes_dropped)
+               *stats_mask |= RTE_MTR_STATS_N_BYTES_DROPPED;
+       if (fm->pkts_dropped)
+               *stats_mask |= RTE_MTR_STATS_N_PKTS_DROPPED;
+       memset(stats, 0, sizeof(*stats));
+       if (ps->pass_cnt) {
+               ret = mlx5_counter_query(dev, ps->pass_cnt, clear, &pkts,
+                                                &bytes);
+               if (ret)
+                       goto error;
+               /* If need to read the packets, set it. */
+               if (fm->green_pkts)
+                       stats->n_pkts[RTE_COLOR_GREEN] = pkts;
+               /* If need to read the bytes, set it. */
+               if (fm->green_bytes)
+                       stats->n_bytes[RTE_COLOR_GREEN] = bytes;
+       }
+       if (ps->drop_cnt) {
+               ret = mlx5_counter_query(dev, ps->drop_cnt, clear, &pkts,
+                                                &bytes);
+               if (ret)
+                       goto error;
+               /* If need to read the packets, set it. */
+               if (fm->pkts_dropped)
+                       stats->n_pkts_dropped = pkts;
+               /* If need to read the bytes, set it. */
+               if (fm->bytes_dropped)
+                       stats->n_bytes_dropped = bytes;
+       }
+       return 0;
+error:
+       return -rte_mtr_error_set(error, ret, RTE_MTR_ERROR_TYPE_STATS, NULL,
+                                "Failed to read policer counters.");
+}
+
 static const struct rte_mtr_ops mlx5_flow_mtr_ops = {
        .capabilities_get = mlx5_flow_mtr_cap_get,
        .meter_profile_add = mlx5_flow_meter_profile_add,
@@ -901,8 +1252,8 @@ static const struct rte_mtr_ops mlx5_flow_mtr_ops = {
        .meter_profile_update = mlx5_flow_meter_profile_update,
        .meter_dscp_table_update = NULL,
        .policer_actions_update = NULL,
-       .stats_update = NULL,
-       .stats_read = NULL,
+       .stats_update = mlx5_flow_meter_stats_update,
+       .stats_read = mlx5_flow_meter_stats_read,
 };
 
 /**
@@ -934,14 +1285,216 @@ mlx5_flow_meter_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
  * @return
  *   Pointer to the profile found on success, NULL otherwise.
  */
-struct mlx5_flow_meter *
-mlx5_flow_meter_find(struct mlx5_priv *priv, uint32_t meter_id)
+struct mlx5_flow_meter_info *
+mlx5_flow_meter_find(struct mlx5_priv *priv, uint32_t meter_id,
+               uint32_t *mtr_idx)
 {
-       struct mlx5_flow_meters *fms = &priv->flow_meters;
-       struct mlx5_flow_meter *fm;
+       struct mlx5_legacy_flow_meter *legacy_fm;
+       struct mlx5_legacy_flow_meters *fms = &priv->flow_meters;
+       struct mlx5_aso_mtr *aso_mtr;
+       struct mlx5_aso_mtr_pools_mng *mtrmng = priv->sh->mtrmng;
+       union mlx5_l3t_data data;
 
-       TAILQ_FOREACH(fm, fms, next)
-               if (meter_id == fm->meter_id)
-                       return fm;
+       if (priv->sh->meter_aso_en) {
+               rte_spinlock_lock(&mtrmng->mtrsl);
+               if (!mtrmng->n_valid) {
+                       rte_spinlock_unlock(&mtrmng->mtrsl);
+                       return NULL;
+               }
+               if (mlx5_l3t_get_entry(priv->mtr_idx_tbl, meter_id, &data) ||
+                       !data.dword) {
+                       rte_spinlock_unlock(&mtrmng->mtrsl);
+                       return NULL;
+               }
+               if (mtr_idx)
+                       *mtr_idx = data.dword;
+               aso_mtr = mlx5_aso_meter_by_idx(priv, data.dword);
+               mlx5_l3t_clear_entry(priv->mtr_idx_tbl, meter_id);
+               if (meter_id == aso_mtr->fm.meter_id) {
+                       rte_spinlock_unlock(&mtrmng->mtrsl);
+                       return &aso_mtr->fm;
+               }
+               rte_spinlock_unlock(&mtrmng->mtrsl);
+       } else {
+               TAILQ_FOREACH(legacy_fm, fms, next)
+                       if (meter_id == legacy_fm->fm.meter_id)
+                               return &legacy_fm->fm;
+       }
        return NULL;
 }
+
+/**
+ * Find meter by index.
+ *
+ * @param priv
+ *   Pointer to mlx5_priv.
+ * @param idx
+ *   Meter index.
+ *
+ * @return
+ *   Pointer to the profile found on success, NULL otherwise.
+ */
+struct mlx5_flow_meter_info *
+flow_dv_meter_find_by_idx(struct mlx5_priv *priv, uint32_t idx)
+{
+       struct mlx5_aso_mtr *aso_mtr;
+
+       if (priv->sh->meter_aso_en) {
+               aso_mtr = mlx5_aso_meter_by_idx(priv, idx);
+               return &aso_mtr->fm;
+       } else {
+               return mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_MTR], idx);
+       }
+}
+
+/**
+ * Attach meter to flow.
+ * Unidirectional Meter creation can only be done
+ * when flow direction is known, i.e. when calling meter_attach.
+ *
+ * @param [in] priv
+ *  Pointer to mlx5 private data.
+ * @param[in] fm
+ *   Pointer to flow meter.
+ * @param [in] attr
+ *  Pointer to flow attributes.
+ * @param [out] error
+ *  Pointer to error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+int
+mlx5_flow_meter_attach(struct mlx5_priv *priv,
+                      struct mlx5_flow_meter_info *fm,
+                      const struct rte_flow_attr *attr,
+                      struct rte_flow_error *error)
+{
+       int ret = 0;
+
+       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) {
+                       fm->ref_cnt = 0;
+                       fm->ingress = 0;
+                       fm->egress = 0;
+                       fm->transfer = 0;
+                       ret = -1;
+                       DRV_LOG(ERR, "Meter action create failed.");
+               }
+       }
+       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 ? -rte_errno : 0;
+}
+
+/**
+ * Detach meter from flow.
+ *
+ * @param [in] fm
+ *  Pointer to flow meter.
+ */
+void
+mlx5_flow_meter_detach(struct mlx5_flow_meter_info *fm)
+{
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
+       rte_spinlock_lock(&fm->sl);
+       MLX5_ASSERT(fm->ref_cnt);
+       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;
+       }
+       rte_spinlock_unlock(&fm->sl);
+#else
+       (void)fm;
+#endif
+}
+
+/**
+ * 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_aso_mtr_pools_mng *mtrmng = priv->sh->mtrmng;
+       struct mlx5_legacy_flow_meters *fms = &priv->flow_meters;
+       struct mlx5_mtr_profiles *fmps = &priv->flow_meter_profiles;
+       struct mlx5_flow_meter_profile *fmp;
+       struct mlx5_legacy_flow_meter *legacy_fm;
+       struct mlx5_flow_meter_info *fm;
+       struct mlx5_aso_mtr_pool *mtr_pool;
+       const struct rte_flow_attr attr = {
+                               .ingress = 1,
+                               .egress = 1,
+                               .transfer = priv->config.dv_esw_en ? 1 : 0,
+                       };
+       void *tmp;
+       uint32_t i, offset, mtr_idx;
+
+       if (priv->sh->meter_aso_en) {
+               i = mtrmng->n_valid;
+               while (i--) {
+                       mtr_pool = mtrmng->pools[i];
+                       for (offset = 0; offset < MLX5_ASO_MTRS_PER_POOL;
+                               offset++) {
+                               fm = &mtr_pool->mtrs[offset].fm;
+                               mtr_idx = MLX5_MAKE_MTR_IDX(i, offset);
+                               if (fm->meter_id != UINT32_MAX &&
+                                       mlx5_flow_meter_params_flush(dev,
+                                               fm, &attr, mtr_idx))
+                                       return -rte_mtr_error_set
+                                       (error, EINVAL,
+                                       RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+                                       NULL, "MTR object meter profile invalid.");
+                       }
+               }
+       } else {
+               TAILQ_FOREACH_SAFE(legacy_fm, fms, next, tmp) {
+                       fm = &legacy_fm->fm;
+                       if (mlx5_flow_meter_params_flush(dev, fm, &attr, 0))
+                               return -rte_mtr_error_set(error, EINVAL,
+                                       RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+                                       NULL, "MTR object meter profile invalid.");
+               }
+       }
+       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);
+               mlx5_free(fmp);
+       }
+       return 0;
+}