net/sfc: use own logging helper macros

[dpdk.git] / drivers / net / mlx5 / mlx5_flow_meter.c

diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c
index 08f7dc8..b36bc7b 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -10,6 +10,7 @@
 #include <rte_mtr_driver.h>
 
 #include <mlx5_devx_cmds.h>
+#include <mlx5_malloc.h>
 
 #include "mlx5.h"
 #include "mlx5_flow.h"
@@ -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;
@@ -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;
 }
 
@@ -636,7 +637,7 @@ mlx5_flow_meter_create(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");
        /* Validate the parameters. */
        ret = mlx5_flow_meter_validate(priv, meter_id, params, error);
        if (ret)
@@ -723,7 +724,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)
@@ -828,7 +829,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)
@@ -869,7 +870,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)
@@ -917,7 +918,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)
@@ -980,7 +981,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)
@@ -1037,7 +1038,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)
@@ -1220,6 +1221,7 @@ error:
 void
 mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
 {
+#ifdef HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER
        MLX5_ASSERT(fm->ref_cnt);
        if (--fm->ref_cnt)
                return;
@@ -1229,6 +1231,9 @@ mlx5_flow_meter_detach(struct mlx5_flow_meter *fm)
        fm->ingress = 0;
        fm->egress = 0;
        fm->transfer = 0;
+#else
+       (void)fm;
+#endif
 }
 
 /**
@@ -1286,7 +1291,7 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct rte_mtr_error *error)
                MLX5_ASSERT(!fmp->ref_cnt);
                /* Remove from list. */
                TAILQ_REMOVE(&priv->flow_meter_profiles, fmp, next);
-               rte_free(fmp);
+               mlx5_free(fmp);
        }
        return 0;
 }