X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow_meter.c;h=dbc574b5081bf36fbb7baa32b28b491f2243386c;hb=255b8f86eb6e483b7015c080a85aba424e0ce420;hp=aa0fd7abdbeea22b2af833e5aec063b46619573a;hpb=8e46d4e18f0961f022218c4b693cd56434a444f0;p=dpdk.git diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index aa0fd7abdb..dbc574b508 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -10,6 +10,7 @@ #include #include +#include #include "mlx5.h" #include "mlx5_flow.h" @@ -55,8 +56,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; @@ -135,7 +136,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 && @@ -303,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; @@ -312,7 +313,7 @@ mlx5_flow_mtr_cap_get(struct rte_eth_dev *dev, 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 | @@ -349,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, @@ -374,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; } @@ -402,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; } @@ -631,11 +632,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) @@ -647,16 +649,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); @@ -675,6 +679,7 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, 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); @@ -683,7 +688,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."); @@ -720,7 +725,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) @@ -746,7 +751,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; } @@ -825,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) @@ -866,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) @@ -914,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) @@ -977,7 +982,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) @@ -1034,7 +1039,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) @@ -1049,7 +1054,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; } @@ -1163,47 +1168,49 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t meter_id, 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); - fm->attr = *attr; + 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->attr.transfer || - attr->ingress != fm->attr.ingress || - attr->egress != fm->attr.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; } /** @@ -1215,15 +1222,20 @@ error: 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 + 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->attr = attr; + fm->mfts->meter_action = NULL; + fm->ingress = 0; + fm->egress = 0; + fm->transfer = 0; + } + rte_spinlock_unlock(&fm->sl); +#else + (void)fm; +#endif } /** @@ -1274,14 +1286,14 @@ 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. */ MLX5_ASSERT(!fmp->ref_cnt); /* Remove from list. */ TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next); - rte_free(fmp); + mlx5_free(fmp); } return 0; }