X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow_meter.c;h=86c334b08b0d20e0c6ee90148d49b7935595a084;hb=551c94c83efbce7e860e36963daae8f62f6e87af;hp=c4d28b282ed62e766194b0d9a52a01ca15af7b24;hpb=02e76468180c21d2f15c768b73457ce00e3bd3f4;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index c4d28b282e..86c334b08b 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -9,6 +9,8 @@ #include #include +#include + #include "mlx5.h" #include "mlx5_flow.h" @@ -53,8 +55,8 @@ mlx5_flow_meter_action_create(struct mlx5_priv *priv, 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; @@ -301,7 +303,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; @@ -347,7 +349,7 @@ 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); @@ -400,19 +402,19 @@ 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); @@ -629,11 +631,12 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, }; 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) @@ -645,16 +648,18 @@ 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; + 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); @@ -681,7 +686,7 @@ error: 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."); @@ -718,7 +723,7 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, 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) @@ -732,7 +737,7 @@ 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. */ @@ -744,7 +749,7 @@ mlx5_flow_meter_destroy(struct rte_eth_dev *dev, uint32_t meter_id, /* 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; } @@ -823,7 +828,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) @@ -864,7 +869,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) @@ -912,7 +917,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) @@ -975,7 +980,7 @@ mlx5_flow_meter_stats_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 object must exist. */ fm = mlx5_flow_meter_find(priv, meter_id); if (fm == NULL) @@ -1032,7 +1037,7 @@ mlx5_flow_meter_stats_read(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) @@ -1047,7 +1052,7 @@ mlx5_flow_meter_stats_read(struct rte_eth_dev *dev, &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; } @@ -1177,18 +1182,20 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t meter_id, 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; @@ -1213,15 +1220,15 @@ error: 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; } /** @@ -1253,7 +1260,7 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error) TAILQ_FOREACH_SAFE(fm, fms, next, tmp) { /* Meter object must not have any owner. */ - RTE_ASSERT(!fm->ref_cnt); + MLX5_ASSERT(!fm->ref_cnt); /* Get meter profile. */ fmp = fm->profile; if (fmp == NULL) @@ -1272,11 +1279,11 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error) /* 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); } TAILQ_FOREACH_SAFE(fmp, fmps, next, tmp) { /* Check unused. */ - RTE_ASSERT(!fmp->ref_cnt); + MLX5_ASSERT(!fmp->ref_cnt); /* Remove from list. */ TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next); rte_free(fmp);