X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_flow_meter.c;h=aa0fd7abdbeea22b2af833e5aec063b46619573a;hb=551712a4d5fdc512df48d431a9e76b0caf771388;hp=7b9d3942c367ab0a99334e834b2334eeb230f8d1;hpb=266e9f3d361162d4cc8d8e81576742c1d3e1c914;p=dpdk.git

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index 7b9d3942c3..aa0fd7abdb 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -4,10 +4,13 @@
  */
 #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.h"
 #include "mlx5_flow.h"
 
@@ -731,7 +734,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. */
@@ -1176,7 +1179,7 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t meter_id,
 		goto error;
 	}
 	if (!fm->ref_cnt++) {
-		RTE_ASSERT(!fm->mfts->meter_action);
+		MLX5_ASSERT(!fm->mfts->meter_action);
 		fm->attr = *attr;
 		/* This also creates the meter object. */
 		fm->mfts->meter_action = mlx5_flow_meter_action_create(priv,
@@ -1184,7 +1187,7 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv, uint32_t meter_id,
 		if (!fm->mfts->meter_action)
 			goto error_detach;
 	} else {
-		RTE_ASSERT(fm->mfts->meter_action);
+		MLX5_ASSERT(fm->mfts->meter_action);
 		if (attr->transfer != fm->attr.transfer ||
 		    attr->ingress != fm->attr.ingress ||
 		    attr->egress != fm->attr.egress) {
@@ -1214,7 +1217,7 @@ 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)
@@ -1222,3 +1225,63 @@ mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
 	fm->mfts->meter_action = NULL;
 	fm->attr = attr;
 }
+
+/**
+ * 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);
+		rte_free(fm);
+	}
+	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);
+	}
+	return 0;
+}