X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow_meter.c;h=03a5e79eb8feaec471b8e08762c32254310f793d;hb=81c3b97735c26b575f8167f2b892edd3a7af451b;hp=7f649240c83800682a15e9ad688b6f4b76653b27;hpb=63ffeb2ff26fd16744daedabf973a9e783141f5b;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 7f649240c8..03a5e79eb8 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -4,13 +4,73 @@ */ #include +#include #include #include #include +#include +#include + #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 *fm) +{ +#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER + struct mlx5dv_dr_flow_meter_attr mtr_init; + void *attr = fm->mfts->fmp; + struct mlx5_flow_meter_srtcm_rfc2697_prm *srtcm = + &fm->profile->srtcm_prm; + + fm->mfts->fmp_size = MLX5_ST_SZ_BYTES(flow_meter_parameters); + memset(attr, 0, fm->mfts->fmp_size); + MLX5_SET(flow_meter_parameters, attr, valid, 1); + MLX5_SET(flow_meter_parameters, attr, bucket_overflow, 1); + MLX5_SET(flow_meter_parameters, attr, + start_color, MLX5_FLOW_COLOR_GREEN); + MLX5_SET(flow_meter_parameters, attr, both_buckets_on_green, 0); + MLX5_SET(flow_meter_parameters, + attr, cbs_exponent, srtcm->cbs_exponent); + MLX5_SET(flow_meter_parameters, + attr, cbs_mantissa, srtcm->cbs_mantissa); + MLX5_SET(flow_meter_parameters, + attr, cir_exponent, srtcm->cir_exponent); + MLX5_SET(flow_meter_parameters, + attr, cir_mantissa, srtcm->cir_mantissa); + MLX5_SET(flow_meter_parameters, + attr, ebs_exponent, srtcm->ebs_exponent); + MLX5_SET(flow_meter_parameters, + attr, ebs_mantissa, srtcm->ebs_mantissa); + 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 = fm->mfts->fmp; + mtr_init.flow_meter_parameter_sz = fm->mfts->fmp_size; + 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. * @@ -244,7 +304,7 @@ 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; cap->n_shared_max = cap->n_max; @@ -290,15 +350,15 @@ 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, @@ -315,7 +375,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 +403,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; } @@ -571,11 +631,13 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, .transfer = priv->config.dv_esw_en ? 1 : 0, }; int ret; + unsigned int i; + uint32_t 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"); /* Validate the parameters. */ ret = mlx5_flow_meter_validate(priv, meter_id, params, error); if (ret) @@ -587,17 +649,25 @@ 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); + 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; - fm->mfts = mlx5_flow_create_mtr_tbls(dev); + 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 (!fm->policer_stats.cnt[i]) + goto error; + } + fm->mfts = mlx5_flow_create_mtr_tbls(dev, fm); if (!fm->mfts) goto error; ret = mlx5_flow_create_policer_rules(dev, fm, &attr); @@ -607,12 +677,18 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, TAILQ_INSERT_TAIL(fms, fm, next); fm->active_state = 1; /* Config meter starts as active. */ 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); mlx5_flow_destroy_mtr_tbls(dev, fm->mfts); - rte_free(fm); + /* 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]); + 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."); @@ -644,11 +720,12 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, .egress = 1, .transfer = priv->config.dv_esw_en ? 1 : 0, }; + unsigned int i; 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) @@ -662,15 +739,19 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, 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. */ 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); + mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_MTR], fm->idx); return 0; } @@ -749,7 +830,7 @@ mlx5_flow_meter_enable(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 object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -790,7 +871,7 @@ mlx5_flow_meter_disable(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 object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -838,7 +919,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) @@ -874,6 +955,141 @@ 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 *fm; + + 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); + if (fm == NULL) + return -rte_mtr_error_set(error, ENOENT, + RTE_MTR_ERROR_TYPE_MTR_ID, + NULL, "Meter object id not valid."); + fm->policer_stats.stats_mask = 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) +{ + static uint64_t meter2mask[RTE_MTR_DROPPED + 1] = { + RTE_MTR_STATS_N_PKTS_GREEN | RTE_MTR_STATS_N_BYTES_GREEN, + RTE_MTR_STATS_N_PKTS_YELLOW | RTE_MTR_STATS_N_BYTES_YELLOW, + RTE_MTR_STATS_N_PKTS_RED | RTE_MTR_STATS_N_BYTES_RED, + RTE_MTR_STATS_N_PKTS_DROPPED | RTE_MTR_STATS_N_BYTES_DROPPED + }; + struct mlx5_priv *priv = dev->data->dev_private; + struct mlx5_flow_meter *fm; + struct mlx5_flow_policer_stats *ps; + uint64_t pkts_dropped = 0; + uint64_t bytes_dropped = 0; + uint64_t pkts; + uint64_t bytes; + int i; + 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); + 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 = ps->stats_mask; + for (i = 0; i < RTE_MTR_DROPPED; i++) { + if (*stats_mask & meter2mask[i]) { + ret = mlx5_counter_query(dev, ps->cnt[i], clear, &pkts, + &bytes); + if (ret) + goto error; + if (fm->action[i] == MTR_POLICER_ACTION_DROP) { + pkts_dropped += pkts; + bytes_dropped += bytes; + } + /* If need to read the packets, set it. */ + if ((1 << i) & (*stats_mask & meter2mask[i])) + stats->n_pkts[i] = pkts; + /* If need to read the bytes, set it. */ + if ((1 << (RTE_MTR_DROPPED + 1 + i)) & + (*stats_mask & meter2mask[i])) + stats->n_bytes[i] = bytes; + } + } + /* Dropped packets/bytes are treated differently. */ + if (*stats_mask & meter2mask[i]) { + ret = mlx5_counter_query(dev, ps->cnt[i], clear, &pkts, + &bytes); + if (ret) + goto error; + pkts += pkts_dropped; + bytes += bytes_dropped; + /* If need to read the packets, set it. */ + if ((*stats_mask & meter2mask[i]) & + RTE_MTR_STATS_N_PKTS_DROPPED) + stats->n_pkts_dropped = pkts; + /* If need to read the bytes, set it. */ + if ((*stats_mask & meter2mask[i]) & + RTE_MTR_STATS_N_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, @@ -885,8 +1101,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, }; /** @@ -929,3 +1145,155 @@ mlx5_flow_meter_find(struct mlx5_priv *priv, uint32_t meter_id) return fm; return NULL; } + +/** + * 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] meter_id + * Flow meter id. + * @param [in] attr + * Pointer to flow attributes. + * @param [out] error + * Pointer to error structure. + * + * @return the flow meter pointer, NULL otherwise. + */ +struct mlx5_flow_meter * +mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t meter_id, + const struct rte_flow_attr *attr, + 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"); + return fm; + } + 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 ? NULL : fm; +} + +/** + * Detach meter from flow. + * + * @param [in] fm + * Pointer to flow meter. + */ +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 == 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_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); + mlx5_free(fmp); + } + return 0; +}