net/mlx: prefix private structure

[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 f24c736..6906dc8 100644 (file)
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -99,6 +99,14 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
                .dpdk_name = "rx_packets_phy",
                .ctr_name = "rx_packets_phy",
        },
+       {
+               .dpdk_name = "tx_discards_phy",
+               .ctr_name = "tx_discards_phy",
+       },
+       {
+               .dpdk_name = "rx_discards_phy",
+               .ctr_name = "rx_discards_phy",
+       },
        {
                .dpdk_name = "tx_bytes_phy",
                .ctr_name = "tx_bytes_phy",
@@ -128,6 +136,24 @@ 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 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);
+
+       file = fopen(path, "rb");
+       if (file) {
+               int n = fscanf(file, "%" SCNu64, stat);
+
+               fclose(file);
+               if (n != 1)
+                       stat = 0;
+       }
+}
+
 /**
  * Read device counters table.
  *
@@ -143,7 +169,7 @@ static const unsigned int xstats_n = RTE_DIM(mlx5_counters_init);
 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;
@@ -155,7 +181,7 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
        et_stats->cmd = ETHTOOL_GSTATS;
        et_stats->n_stats = xstats_ctrl->stats_n;
        ifr.ifr_data = (caddr_t)et_stats;
-       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
+       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
                DRV_LOG(WARNING,
                        "port %u unable to read statistic values from device",
@@ -164,19 +190,8 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
        }
        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,
-                             xstats_ctrl->info[i].ctr_name);
-
-                       file = fopen(path, "rb");
-                       if (file) {
-                               int n = fscanf(file, "%" SCNu64, &stats[i]);
-
-                               fclose(file);
-                               if (n != 1)
-                                       stats[i] = 0;
-                       }
+                       mlx5_read_ib_stat(priv, xstats_ctrl->info[i].ctr_name,
+                                         &stats[i]);
                } else {
                        stats[i] = (uint64_t)
                                et_stats->data[xstats_ctrl->dev_table_idx[i]];
@@ -203,7 +218,7 @@ mlx5_ethtool_get_stats_n(struct rte_eth_dev *dev) {
 
        drvinfo.cmd = ETHTOOL_GDRVINFO;
        ifr.ifr_data = (caddr_t)&drvinfo;
-       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
+       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
                DRV_LOG(WARNING, "port %u unable to query number of statistics",
                        dev->data->port_id);
@@ -219,10 +234,11 @@ mlx5_ethtool_get_stats_n(struct rte_eth_dev *dev) {
  *   Pointer to Ethernet device.
  */
 void
-mlx5_xstats_init(struct rte_eth_dev *dev)
+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;
        unsigned int j;
        struct ifreq ifr;
@@ -254,7 +270,7 @@ mlx5_xstats_init(struct rte_eth_dev *dev)
        strings->string_set = ETH_SS_STATS;
        strings->len = dev_stats_n;
        ifr.ifr_data = (caddr_t)strings;
-       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
+       ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
        if (ret) {
                DRV_LOG(WARNING, "port %u unable to get statistic names",
                        dev->data->port_id);
@@ -290,6 +306,7 @@ mlx5_xstats_init(struct rte_eth_dev *dev)
        if (ret)
                DRV_LOG(ERR, "port %u cannot read device counters: %s",
                        dev->data->port_id, strerror(rte_errno));
+       mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
 free:
        rte_free(strings);
 }
@@ -312,7 +329,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;
@@ -326,7 +343,7 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                if (stats_n < 0)
                        return stats_n;
                if (xstats_ctrl->stats_n != stats_n)
-                       mlx5_xstats_init(dev);
+                       mlx5_stats_init(dev);
                ret = mlx5_read_dev_counters(dev, counters);
                if (ret)
                        return ret;
@@ -353,11 +370,12 @@ 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 rte_eth_stats tmp = {0};
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct rte_eth_stats tmp;
        unsigned int i;
        unsigned int idx;
 
+       memset(&tmp, 0, sizeof(tmp));
        /* Add software counters. */
        for (i = 0; (i != priv->rxqs_n); ++i) {
                struct mlx5_rxq_data *rxq = (*priv->rxqs)[i];
@@ -399,6 +417,8 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 #endif
                tmp.oerrors += txq->stats.oerrors;
        }
+       mlx5_read_ib_stat(priv, "out_of_buffer", &tmp.imissed);
+       tmp.imissed -= priv->stats_ctrl.imissed_base;
 #ifndef MLX5_PMD_SOFT_COUNTERS
        /* FIXME: retrieve and add hardware counters. */
 #endif
@@ -415,7 +435,8 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 void
 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;
 
@@ -433,6 +454,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
                (*priv->txqs)[i]->stats =
                        (struct mlx5_txq_stats){ .idx = idx };
        }
+       mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
 #ifndef MLX5_PMD_SOFT_COUNTERS
        /* FIXME: reset hardware counters. */
 #endif
@@ -447,7 +469,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
 void
 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;
@@ -462,7 +484,7 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
                return;
        }
        if (xstats_ctrl->stats_n != stats_n)
-               mlx5_xstats_init(dev);
+               mlx5_stats_init(dev);
        ret = mlx5_read_dev_counters(dev, counters);
        if (ret) {
                DRV_LOG(ERR, "port %u cannot read device counters: %s",
@@ -491,7 +513,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;