net/mlx5: add devarg for extensive metadata support

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

diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 38e8915..205e4fe 100644 (file)
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -137,21 +137,25 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
 static const unsigned int xstats_n = RTE_DIM(mlx5_counters_init);
 
 static inline void
-mlx5_read_ib_stat(struct priv *priv, const char *ctr_name, uint64_t *stat)
+mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
 {
        FILE *file;
-       MKSTR(path, "%s/ports/1/hw_counters/%s",
-                 priv->ibdev_path,
-                 ctr_name);
+       if (priv->sh) {
+               MKSTR(path, "%s/ports/%d/hw_counters/%s",
+                         priv->sh->ibdev_path,
+                         priv->ibv_port,
+                         ctr_name);
 
-       file = fopen(path, "rb");
-       if (file) {
-               int n = fscanf(file, "%" SCNu64, stat);
+               file = fopen(path, "rb");
+               if (file) {
+                       int n = fscanf(file, "%" SCNu64, stat);
 
-               fclose(file);
-               if (n != 1)
-                       stat = 0;
+                       fclose(file);
+                       if (n == 1)
+                               return;
+               }
        }
+       *stat = 0;
 }
 
 /**
@@ -169,7 +173,7 @@ mlx5_read_ib_stat(struct priv *priv, const char *ctr_name, uint64_t *stat)
 static int
 mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
        unsigned int i;
        struct ifreq ifr;
@@ -236,7 +240,7 @@ mlx5_ethtool_get_stats_n(struct rte_eth_dev *dev) {
 void
 mlx5_stats_init(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
        struct mlx5_stats_ctrl *stats_ctrl = &priv->stats_ctrl;
        unsigned int i;
@@ -329,7 +333,7 @@ int
 mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                unsigned int n)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        unsigned int i;
        uint64_t counters[n];
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
@@ -370,7 +374,7 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
 int
 mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct rte_eth_stats tmp;
        unsigned int i;
        unsigned int idx;
@@ -382,7 +386,7 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
                if (rxq == NULL)
                        continue;
-               idx = rxq->stats.idx;
+               idx = rxq->idx;
                if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
 #ifdef MLX5_PMD_SOFT_COUNTERS
                        tmp.q_ipackets[idx] += rxq->stats.ipackets;
@@ -403,13 +407,12 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
                if (txq == NULL)
                        continue;
-               idx = txq->stats.idx;
+               idx = txq->idx;
                if (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {
 #ifdef MLX5_PMD_SOFT_COUNTERS
                        tmp.q_opackets[idx] += txq->stats.opackets;
                        tmp.q_obytes[idx] += txq->stats.obytes;
 #endif
-                       tmp.q_errors[idx] += txq->stats.oerrors;
                }
 #ifdef MLX5_PMD_SOFT_COUNTERS
                tmp.opackets += txq->stats.opackets;
@@ -431,33 +434,35 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   always 0 on success and stats is reset
  */
-void
+int
 mlx5_stats_reset(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_stats_ctrl *stats_ctrl = &priv->stats_ctrl;
        unsigned int i;
-       unsigned int idx;
 
        for (i = 0; (i != priv->rxqs_n); ++i) {
                if ((*priv->rxqs)[i] == NULL)
                        continue;
-               idx = (*priv->rxqs)[i]->stats.idx;
-               (*priv->rxqs)[i]->stats =
-                       (struct mlx5_rxq_stats){ .idx = idx };
+               memset(&(*priv->rxqs)[i]->stats, 0,
+                      sizeof(struct mlx5_rxq_stats));
        }
        for (i = 0; (i != priv->txqs_n); ++i) {
                if ((*priv->txqs)[i] == NULL)
                        continue;
-               idx = (*priv->txqs)[i]->stats.idx;
-               (*priv->txqs)[i]->stats =
-                       (struct mlx5_txq_stats){ .idx = idx };
+               memset(&(*priv->txqs)[i]->stats, 0,
+                      sizeof(struct mlx5_txq_stats));
        }
        mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
 #ifndef MLX5_PMD_SOFT_COUNTERS
        /* FIXME: reset hardware counters. */
 #endif
+
+       return 0;
 }
 
 /**
@@ -465,11 +470,15 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
  *
  * @param dev
  *   Pointer to Ethernet device structure.
+ *
+ * @return
+ *   0 on success and stats is reset, negative errno value otherwise and
+ *   rte_errno is set.
  */
-void
+int
 mlx5_xstats_reset(struct rte_eth_dev *dev)
 {
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
        int stats_n;
        unsigned int i;
@@ -481,7 +490,7 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
        if (stats_n < 0) {
                DRV_LOG(ERR, "port %u cannot get stats: %s", dev->data->port_id,
                        strerror(-stats_n));
-               return;
+               return stats_n;
        }
        if (xstats_ctrl->stats_n != stats_n)
                mlx5_stats_init(dev);
@@ -489,10 +498,12 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
        if (ret) {
                DRV_LOG(ERR, "port %u cannot read device counters: %s",
                        dev->data->port_id, strerror(rte_errno));
-               return;
+               return ret;
        }
        for (i = 0; i != n; ++i)
                xstats_ctrl->base[i] = counters[i];
+
+       return 0;
 }
 
 /**
@@ -513,7 +524,7 @@ mlx5_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                      struct rte_eth_xstat_name *xstats_names, unsigned int n)
 {
        unsigned int i;
-       struct priv *priv = dev->data->dev_private;
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
        unsigned int mlx5_xstats_n = xstats_ctrl->mlx5_stats_n;