net/mlx5: support missing counter in extended statistics

The current code would fail if one of the counters DPDK counters was not
found on the device counters.

As representors and PF port has different counters the both cannot work
together.

Addressing this issue by making the counter init more flexible to
contain all the counter found and skipping the error.

Cc: stable@dpdk.org
Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 4122e546cb36533358530e95d86f9cbeb698f7d0..ab242980a585c96fd823e9ac59f928a8e192d08a 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -72,12 +72,23 @@ struct mlx5_shared_data {
 
 extern struct mlx5_shared_data *mlx5_shared_data;
 
+struct mlx5_counter_ctrl {
+       /* Name of the counter. */
+       char dpdk_name[RTE_ETH_XSTATS_NAME_SIZE];
+       /* Name of the counter on the device table. */
+       char ctr_name[RTE_ETH_XSTATS_NAME_SIZE];
+       uint32_t ib:1; /**< Nonzero for IB counters. */
+};
+
 struct mlx5_xstats_ctrl {
        /* Number of device stats. */
        uint16_t stats_n;
+       /* Number of device stats identified by PMD. */
+       uint16_t  mlx5_stats_n;
        /* Index in the device counters table. */
        uint16_t dev_table_idx[MLX5_MAX_XSTATS];
        uint64_t base[MLX5_MAX_XSTATS];
+       struct mlx5_counter_ctrl info[MLX5_MAX_XSTATS];
 };
 
 /* Flow list . */

diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index ed5b51bb230dae7933431e8c69db6c8dcaf9c95f..9b89b9bfd2bd122f8b0d481d1911d7982ebd8bdd 100644 (file)
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -17,14 +17,6 @@
 #include "mlx5_rxtx.h"
 #include "mlx5_defs.h"
 
-struct mlx5_counter_ctrl {
-       /* Name of the counter. */
-       char dpdk_name[RTE_ETH_XSTATS_NAME_SIZE];
-       /* Name of the counter on the device table. */
-       char ctr_name[RTE_ETH_XSTATS_NAME_SIZE];
-       uint32_t ib:1; /**< Nonzero for IB counters. */
-};
-
 static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
        {
                .dpdk_name = "rx_port_unicast_bytes",
@@ -153,12 +145,12 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
                        dev->data->port_id);
                return ret;
        }
-       for (i = 0; i != xstats_n; ++i) {
-               if (mlx5_counters_init[i].ib) {
+       for (i = 0; i != xstats_ctrl->mlx5_stats_n; ++i) {
+               if (xstats_ctrl->info[i].ib) {
                        FILE *file;
                        MKSTR(path, "%s/ports/1/hw_counters/%s",
                              priv->ibdev_path,
-                             mlx5_counters_init[i].ctr_name);
+                             xstats_ctrl->info[i].ctr_name);
 
                        file = fopen(path, "rb");
                        if (file) {
@@ -222,6 +214,8 @@ mlx5_xstats_init(struct rte_eth_dev *dev)
        unsigned int str_sz;
        int ret;
 
+       /* So that it won't aggregate for each init. */
+       xstats_ctrl->mlx5_stats_n = 0;
        ret = mlx5_ethtool_get_stats_n(dev);
        if (ret < 0) {
                DRV_LOG(WARNING, "port %u no extended statistics available",
@@ -249,8 +243,6 @@ mlx5_xstats_init(struct rte_eth_dev *dev)
                        dev->data->port_id);
                goto free;
        }
-       for (j = 0; j != xstats_n; ++j)
-               xstats_ctrl->dev_table_idx[j] = dev_stats_n;
        for (i = 0; i != dev_stats_n; ++i) {
                const char *curr_string = (const char *)
                        &strings->data[i * ETH_GSTRING_LEN];
@@ -258,25 +250,25 @@ mlx5_xstats_init(struct rte_eth_dev *dev)
                for (j = 0; j != xstats_n; ++j) {
                        if (!strcmp(mlx5_counters_init[j].ctr_name,
                                    curr_string)) {
-                               xstats_ctrl->dev_table_idx[j] = i;
+                               unsigned int idx = xstats_ctrl->mlx5_stats_n++;
+
+                               xstats_ctrl->dev_table_idx[idx] = i;
+                               xstats_ctrl->info[idx] = mlx5_counters_init[j];
                                break;
                        }
                }
        }
-       for (j = 0; j != xstats_n; ++j) {
-               if (mlx5_counters_init[j].ib)
-                       continue;
-               if (xstats_ctrl->dev_table_idx[j] >= dev_stats_n) {
-                       DRV_LOG(WARNING,
-                               "port %u counter \"%s\" is not recognized",
-                               dev->data->port_id,
-                               mlx5_counters_init[j].dpdk_name);
-                       goto free;
+       /* Add IB counters. */
+       for (i = 0; i != xstats_n; ++i) {
+               if (mlx5_counters_init[i].ib) {
+                       unsigned int idx = xstats_ctrl->mlx5_stats_n++;
+
+                       xstats_ctrl->info[idx] = mlx5_counters_init[i];
                }
        }
+       assert(xstats_ctrl->mlx5_stats_n <= MLX5_MAX_XSTATS);
        xstats_ctrl->stats_n = dev_stats_n;
        /* Copy to base at first time. */
-       assert(xstats_n <= MLX5_MAX_XSTATS);
        ret = mlx5_read_dev_counters(dev, xstats_ctrl->base);
        if (ret)
                DRV_LOG(ERR, "port %u cannot read device counters: %s",
@@ -306,11 +298,10 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
        struct priv *priv = dev->data->dev_private;
        unsigned int i;
        uint64_t counters[n];
+       struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
+       uint16_t mlx5_stats_n = xstats_ctrl->mlx5_stats_n;
 
-       if (!priv->xstats_ctrl.stats_n)
-               return 0;
-       if (n >= xstats_n && stats) {
-               struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
+       if (n >= mlx5_stats_n && stats) {
                int stats_n;
                int ret;
 
@@ -322,12 +313,12 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                ret = mlx5_read_dev_counters(dev, counters);
                if (ret)
                        return ret;
-               for (i = 0; i != xstats_n; ++i) {
+               for (i = 0; i != mlx5_stats_n; ++i) {
                        stats[i].id = i;
                        stats[i].value = (counters[i] - xstats_ctrl->base[i]);
                }
        }
-       return xstats_n;
+       return mlx5_stats_n;
 }
 
 /**
@@ -443,7 +434,7 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
        struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
        int stats_n;
        unsigned int i;
-       unsigned int n = xstats_n;
+       unsigned int n = xstats_ctrl->mlx5_stats_n;
        uint64_t counters[n];
        int ret;
 
@@ -482,18 +473,18 @@ int
 mlx5_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                      struct rte_eth_xstat_name *xstats_names, unsigned int n)
 {
-       struct priv *priv = dev->data->dev_private;
        unsigned int i;
+       struct 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;
 
-       if (!priv->xstats_ctrl.stats_n)
-               return 0;
-       if (n >= xstats_n && xstats_names) {
-               for (i = 0; i != xstats_n; ++i) {
+       if (n >= mlx5_xstats_n && xstats_names) {
+               for (i = 0; i != mlx5_xstats_n; ++i) {
                        strncpy(xstats_names[i].name,
-                               mlx5_counters_init[i].dpdk_name,
+                               xstats_ctrl->info[i].dpdk_name,
                                RTE_ETH_XSTATS_NAME_SIZE);
                        xstats_names[i].name[RTE_ETH_XSTATS_NAME_SIZE - 1] = 0;
                }
        }
-       return xstats_n;
+       return mlx5_xstats_n;
 }