net/ionic: add stats

Add basic, per queue and extended statistics for
RX and TX, both from the adapter and the driver.

Signed-off-by: Alfredo Cardigliano <cardigliano@ntop.org>
Reviewed-by: Shannon Nelson <snelson@pensando.io>

diff --git a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini
index 9a15525..8cd5936 100644 (file)
--- a/doc/guides/nics/features/ionic.ini
+++ b/doc/guides/nics/features/ionic.ini
@@ -26,6 +26,9 @@ CRC offload          = Y
 L3 checksum offload  = Y
 L4 checksum offload  = Y
 Packet type parsing  = Y
+Basic stats          = Y
+Extended stats       = Y
+Stats per queue      = Y
 Linux UIO            = Y
 Linux VFIO           = Y
 x86-64               = Y

diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 5d546b9..1ba307d 100644 (file)
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -43,6 +43,19 @@ static int  ionic_dev_rss_hash_conf_get(struct rte_eth_dev *eth_dev,
        struct rte_eth_rss_conf *rss_conf);
 static int  ionic_dev_rss_hash_update(struct rte_eth_dev *eth_dev,
        struct rte_eth_rss_conf *rss_conf);
+static int  ionic_dev_stats_get(struct rte_eth_dev *eth_dev,
+       struct rte_eth_stats *stats);
+static int  ionic_dev_stats_reset(struct rte_eth_dev *eth_dev);
+static int  ionic_dev_xstats_get(struct rte_eth_dev *dev,
+       struct rte_eth_xstat *xstats, unsigned int n);
+static int  ionic_dev_xstats_get_by_id(struct rte_eth_dev *dev,
+       const uint64_t *ids, uint64_t *values, unsigned int n);
+static int  ionic_dev_xstats_reset(struct rte_eth_dev *dev);
+static int  ionic_dev_xstats_get_names(struct rte_eth_dev *dev,
+       struct rte_eth_xstat_name *xstats_names, unsigned int size);
+static int  ionic_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
+       struct rte_eth_xstat_name *xstats_names, const uint64_t *ids,
+       unsigned int limit);
 
 int ionic_logtype;
 
@@ -102,8 +115,102 @@ static const struct eth_dev_ops ionic_eth_dev_ops = {
        .reta_query             = ionic_dev_rss_reta_query,
        .rss_hash_conf_get      = ionic_dev_rss_hash_conf_get,
        .rss_hash_update        = ionic_dev_rss_hash_update,
+       .stats_get              = ionic_dev_stats_get,
+       .stats_reset            = ionic_dev_stats_reset,
+       .xstats_get             = ionic_dev_xstats_get,
+       .xstats_get_by_id       = ionic_dev_xstats_get_by_id,
+       .xstats_reset           = ionic_dev_xstats_reset,
+       .xstats_get_names       = ionic_dev_xstats_get_names,
+       .xstats_get_names_by_id = ionic_dev_xstats_get_names_by_id,
 };
 
+struct rte_ionic_xstats_name_off {
+       char name[RTE_ETH_XSTATS_NAME_SIZE];
+       unsigned int offset;
+};
+
+static const struct rte_ionic_xstats_name_off rte_ionic_xstats_strings[] = {
+       /* RX */
+       {"rx_ucast_bytes", offsetof(struct ionic_lif_stats,
+                       rx_ucast_bytes)},
+       {"rx_ucast_packets", offsetof(struct ionic_lif_stats,
+                       rx_ucast_packets)},
+       {"rx_mcast_bytes", offsetof(struct ionic_lif_stats,
+                       rx_mcast_bytes)},
+       {"rx_mcast_packets", offsetof(struct ionic_lif_stats,
+                       rx_mcast_packets)},
+       {"rx_bcast_bytes", offsetof(struct ionic_lif_stats,
+                       rx_bcast_bytes)},
+       {"rx_bcast_packets", offsetof(struct ionic_lif_stats,
+                       rx_bcast_packets)},
+       /* RX drops */
+       {"rx_ucast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       rx_ucast_drop_bytes)},
+       {"rx_ucast_drop_packets", offsetof(struct ionic_lif_stats,
+                       rx_ucast_drop_packets)},
+       {"rx_mcast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       rx_mcast_drop_bytes)},
+       {"rx_mcast_drop_packets", offsetof(struct ionic_lif_stats,
+                       rx_mcast_drop_packets)},
+       {"rx_bcast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       rx_bcast_drop_bytes)},
+       {"rx_bcast_drop_packets", offsetof(struct ionic_lif_stats,
+                       rx_bcast_drop_packets)},
+       {"rx_dma_error", offsetof(struct ionic_lif_stats,
+                       rx_dma_error)},
+       /* TX */
+       {"tx_ucast_bytes", offsetof(struct ionic_lif_stats,
+                       tx_ucast_bytes)},
+       {"tx_ucast_packets", offsetof(struct ionic_lif_stats,
+                       tx_ucast_packets)},
+       {"tx_mcast_bytes", offsetof(struct ionic_lif_stats,
+                       tx_mcast_bytes)},
+       {"tx_mcast_packets", offsetof(struct ionic_lif_stats,
+                       tx_mcast_packets)},
+       {"tx_bcast_bytes", offsetof(struct ionic_lif_stats,
+                       tx_bcast_bytes)},
+       {"tx_bcast_packets", offsetof(struct ionic_lif_stats,
+                       tx_bcast_packets)},
+       /* TX drops */
+       {"tx_ucast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       tx_ucast_drop_bytes)},
+       {"tx_ucast_drop_packets", offsetof(struct ionic_lif_stats,
+                       tx_ucast_drop_packets)},
+       {"tx_mcast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       tx_mcast_drop_bytes)},
+       {"tx_mcast_drop_packets", offsetof(struct ionic_lif_stats,
+                       tx_mcast_drop_packets)},
+       {"tx_bcast_drop_bytes", offsetof(struct ionic_lif_stats,
+                       tx_bcast_drop_bytes)},
+       {"tx_bcast_drop_packets", offsetof(struct ionic_lif_stats,
+                       tx_bcast_drop_packets)},
+       {"tx_dma_error", offsetof(struct ionic_lif_stats,
+                       tx_dma_error)},
+       /* Rx Queue/Ring drops */
+       {"rx_queue_disabled", offsetof(struct ionic_lif_stats,
+                       rx_queue_disabled)},
+       {"rx_queue_empty", offsetof(struct ionic_lif_stats,
+                       rx_queue_empty)},
+       {"rx_queue_error", offsetof(struct ionic_lif_stats,
+                       rx_queue_error)},
+       {"rx_desc_fetch_error", offsetof(struct ionic_lif_stats,
+                       rx_desc_fetch_error)},
+       {"rx_desc_data_error", offsetof(struct ionic_lif_stats,
+                       rx_desc_data_error)},
+       /* Tx Queue/Ring drops */
+       {"tx_queue_disabled", offsetof(struct ionic_lif_stats,
+                       tx_queue_disabled)},
+       {"tx_queue_error", offsetof(struct ionic_lif_stats,
+                       tx_queue_error)},
+       {"tx_desc_fetch_error", offsetof(struct ionic_lif_stats,
+                       tx_desc_fetch_error)},
+       {"tx_desc_data_error", offsetof(struct ionic_lif_stats,
+                       tx_desc_data_error)},
+};
+
+#define IONIC_NB_HW_STATS (sizeof(rte_ionic_xstats_strings) / \
+               sizeof(rte_ionic_xstats_strings[0]))
+
 /*
  * Set device link up, enable tx.
  */
@@ -580,6 +687,152 @@ ionic_dev_rss_hash_update(struct rte_eth_dev *eth_dev,
        return 0;
 }
 
+static int
+ionic_dev_stats_get(struct rte_eth_dev *eth_dev,
+               struct rte_eth_stats *stats)
+{
+       struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
+
+       ionic_lif_get_stats(lif, stats);
+
+       return 0;
+}
+
+static int
+ionic_dev_stats_reset(struct rte_eth_dev *eth_dev)
+{
+       struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
+
+       IONIC_PRINT_CALL();
+
+       ionic_lif_reset_stats(lif);
+
+       return 0;
+}
+
+static int
+ionic_dev_xstats_get_names(__rte_unused struct rte_eth_dev *eth_dev,
+               struct rte_eth_xstat_name *xstats_names,
+               __rte_unused unsigned int size)
+{
+       unsigned int i;
+
+       if (xstats_names != NULL) {
+               for (i = 0; i < IONIC_NB_HW_STATS; i++) {
+                       snprintf(xstats_names[i].name,
+                                       sizeof(xstats_names[i].name),
+                                       "%s", rte_ionic_xstats_strings[i].name);
+               }
+       }
+
+       return IONIC_NB_HW_STATS;
+}
+
+static int
+ionic_dev_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
+               struct rte_eth_xstat_name *xstats_names, const uint64_t *ids,
+               unsigned int limit)
+{
+       struct rte_eth_xstat_name xstats_names_copy[IONIC_NB_HW_STATS];
+       uint16_t i;
+
+       if (!ids) {
+               if (xstats_names != NULL) {
+                       for (i = 0; i < IONIC_NB_HW_STATS; i++) {
+                               snprintf(xstats_names[i].name,
+                                       sizeof(xstats_names[i].name),
+                                       "%s", rte_ionic_xstats_strings[i].name);
+                       }
+               }
+
+               return IONIC_NB_HW_STATS;
+       }
+
+       ionic_dev_xstats_get_names_by_id(eth_dev, xstats_names_copy, NULL,
+               IONIC_NB_HW_STATS);
+
+       for (i = 0; i < limit; i++) {
+               if (ids[i] >= IONIC_NB_HW_STATS) {
+                       IONIC_PRINT(ERR, "id value isn't valid");
+                       return -1;
+               }
+
+               strcpy(xstats_names[i].name, xstats_names_copy[ids[i]].name);
+       }
+
+       return limit;
+}
+
+static int
+ionic_dev_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *xstats,
+               unsigned int n)
+{
+       struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
+       struct ionic_lif_stats hw_stats;
+       uint16_t i;
+
+       if (n < IONIC_NB_HW_STATS)
+               return IONIC_NB_HW_STATS;
+
+       ionic_lif_get_hw_stats(lif, &hw_stats);
+
+       for (i = 0; i < IONIC_NB_HW_STATS; i++) {
+               xstats[i].value = *(uint64_t *)(((char *)&hw_stats) +
+                               rte_ionic_xstats_strings[i].offset);
+               xstats[i].id = i;
+       }
+
+       return IONIC_NB_HW_STATS;
+}
+
+static int
+ionic_dev_xstats_get_by_id(struct rte_eth_dev *eth_dev, const uint64_t *ids,
+               uint64_t *values, unsigned int n)
+{
+       struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
+       struct ionic_lif_stats hw_stats;
+       uint64_t values_copy[IONIC_NB_HW_STATS];
+       uint16_t i;
+
+       if (!ids) {
+               if (!ids && n < IONIC_NB_HW_STATS)
+                       return IONIC_NB_HW_STATS;
+
+               ionic_lif_get_hw_stats(lif, &hw_stats);
+
+               for (i = 0; i < IONIC_NB_HW_STATS; i++) {
+                       values[i] = *(uint64_t *)(((char *)&hw_stats) +
+                                       rte_ionic_xstats_strings[i].offset);
+               }
+
+               return IONIC_NB_HW_STATS;
+       }
+
+       ionic_dev_xstats_get_by_id(eth_dev, NULL, values_copy,
+                       IONIC_NB_HW_STATS);
+
+       for (i = 0; i < n; i++) {
+               if (ids[i] >= IONIC_NB_HW_STATS) {
+                       IONIC_PRINT(ERR, "id value isn't valid");
+                       return -1;
+               }
+
+               values[i] = values_copy[ids[i]];
+       }
+
+       return n;
+}
+
+static int
+ionic_dev_xstats_reset(struct rte_eth_dev *eth_dev)
+{
+       struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
+
+       ionic_lif_reset_hw_stats(lif);
+
+       return 0;
+}
+
 static int
 ionic_dev_configure(struct rte_eth_dev *eth_dev)
 {

diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index b7b4efb..c13a2d1 100644 (file)
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -84,6 +84,153 @@ ionic_lif_reset(struct ionic_lif *lif)
        ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
 }
 
+static void
+ionic_lif_get_abs_stats(const struct ionic_lif *lif, struct rte_eth_stats *stats)
+{
+       struct ionic_lif_stats *ls = &lif->info->stats;
+       uint32_t i;
+       uint32_t num_rx_q_counters = RTE_MIN(lif->nrxqcqs, (uint32_t)
+                       RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       uint32_t num_tx_q_counters = RTE_MIN(lif->ntxqcqs, (uint32_t)
+                       RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       memset(stats, 0, sizeof(*stats));
+
+       if (ls == NULL) {
+               IONIC_PRINT(DEBUG, "Stats on port %u not yet initialized",
+                       lif->port_id);
+               return;
+       }
+
+       /* RX */
+
+       stats->ipackets = ls->rx_ucast_packets +
+               ls->rx_mcast_packets +
+               ls->rx_bcast_packets;
+
+       stats->ibytes = ls->rx_ucast_bytes +
+               ls->rx_mcast_bytes +
+               ls->rx_bcast_bytes;
+
+       for (i = 0; i < lif->nrxqcqs; i++) {
+               struct ionic_rx_stats *rx_stats = &lif->rxqcqs[i]->stats.rx;
+               stats->imissed +=
+                       rx_stats->no_cb_arg +
+                       rx_stats->bad_cq_status +
+                       rx_stats->no_room +
+                       rx_stats->bad_len;
+       }
+
+       stats->imissed +=
+               ls->rx_ucast_drop_packets +
+               ls->rx_mcast_drop_packets +
+               ls->rx_bcast_drop_packets;
+
+       stats->imissed +=
+               ls->rx_queue_empty +
+               ls->rx_dma_error +
+               ls->rx_queue_disabled +
+               ls->rx_desc_fetch_error +
+               ls->rx_desc_data_error;
+
+       for (i = 0; i < num_rx_q_counters; i++) {
+               struct ionic_rx_stats *rx_stats = &lif->rxqcqs[i]->stats.rx;
+               stats->q_ipackets[i] = rx_stats->packets;
+               stats->q_ibytes[i] = rx_stats->bytes;
+               stats->q_errors[i] =
+                       rx_stats->no_cb_arg +
+                       rx_stats->bad_cq_status +
+                       rx_stats->no_room +
+                       rx_stats->bad_len;
+       }
+
+       /* TX */
+
+       stats->opackets = ls->tx_ucast_packets +
+               ls->tx_mcast_packets +
+               ls->tx_bcast_packets;
+
+       stats->obytes = ls->tx_ucast_bytes +
+               ls->tx_mcast_bytes +
+               ls->tx_bcast_bytes;
+
+       for (i = 0; i < lif->ntxqcqs; i++) {
+               struct ionic_tx_stats *tx_stats = &lif->txqcqs[i]->stats.tx;
+               stats->oerrors += tx_stats->drop;
+       }
+
+       stats->oerrors +=
+               ls->tx_ucast_drop_packets +
+               ls->tx_mcast_drop_packets +
+               ls->tx_bcast_drop_packets;
+
+       stats->oerrors +=
+               ls->tx_dma_error +
+               ls->tx_queue_disabled +
+               ls->tx_desc_fetch_error +
+               ls->tx_desc_data_error;
+
+       for (i = 0; i < num_tx_q_counters; i++) {
+               struct ionic_tx_stats *tx_stats = &lif->txqcqs[i]->stats.tx;
+               stats->q_opackets[i] = tx_stats->packets;
+               stats->q_obytes[i] = tx_stats->bytes;
+       }
+}
+
+void
+ionic_lif_get_stats(const struct ionic_lif *lif,
+               struct rte_eth_stats *stats)
+{
+       ionic_lif_get_abs_stats(lif, stats);
+
+       stats->ipackets  -= lif->stats_base.ipackets;
+       stats->opackets  -= lif->stats_base.opackets;
+       stats->ibytes    -= lif->stats_base.ibytes;
+       stats->obytes    -= lif->stats_base.obytes;
+       stats->imissed   -= lif->stats_base.imissed;
+       stats->ierrors   -= lif->stats_base.ierrors;
+       stats->oerrors   -= lif->stats_base.oerrors;
+       stats->rx_nombuf -= lif->stats_base.rx_nombuf;
+}
+
+void
+ionic_lif_reset_stats(struct ionic_lif *lif)
+{
+       uint32_t i;
+
+       for (i = 0; i < lif->nrxqcqs; i++) {
+               memset(&lif->rxqcqs[i]->stats.rx, 0,
+                       sizeof(struct ionic_rx_stats));
+               memset(&lif->txqcqs[i]->stats.tx, 0,
+                       sizeof(struct ionic_tx_stats));
+       }
+
+       ionic_lif_get_abs_stats(lif, &lif->stats_base);
+}
+
+void
+ionic_lif_get_hw_stats(struct ionic_lif *lif, struct ionic_lif_stats *stats)
+{
+       uint16_t i, count = sizeof(struct ionic_lif_stats) / sizeof(uint64_t);
+       uint64_t *stats64 = (uint64_t *)stats;
+       uint64_t *lif_stats64 = (uint64_t *)&lif->info->stats;
+       uint64_t *lif_stats64_base = (uint64_t *)&lif->lif_stats_base;
+
+       for (i = 0; i < count; i++)
+               stats64[i] = lif_stats64[i] - lif_stats64_base[i];
+}
+
+void
+ionic_lif_reset_hw_stats(struct ionic_lif *lif)
+{
+       uint16_t i, count = sizeof(struct ionic_lif_stats) / sizeof(uint64_t);
+       uint64_t *lif_stats64 = (uint64_t *)&lif->info->stats;
+       uint64_t *lif_stats64_base = (uint64_t *)&lif->lif_stats_base;
+
+       for (i = 0; i < count; i++)
+               lif_stats64_base[i] = lif_stats64[i];
+}
+
 static int
 ionic_lif_addr_add(struct ionic_lif *lif, const uint8_t *addr)
 {
@@ -1319,6 +1466,8 @@ ionic_lif_init(struct ionic_lif *lif)
        struct ionic_q_init_comp comp;
        int err;
 
+       memset(&lif->stats_base, 0, sizeof(lif->stats_base));
+
        ionic_dev_cmd_lif_init(idev, lif->index, lif->info_pa);
        err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
        ionic_dev_cmd_comp(idev, &comp);

diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h
index a6f579d..558d23f 100644 (file)
--- a/drivers/net/ionic/ionic_lif.h
+++ b/drivers/net/ionic/ionic_lif.h
@@ -113,6 +113,8 @@ struct ionic_lif {
        struct ionic_lif_info *info;
        rte_iova_t info_pa;
        const struct rte_memzone *info_z;
+       struct rte_eth_stats stats_base;
+       struct ionic_lif_stats lif_stats_base;
 };
 
 int ionic_lif_identify(struct ionic_adapter *adapter);
@@ -174,6 +176,14 @@ int ionic_lif_rss_config(struct ionic_lif *lif, const uint16_t types,
 
 int ionic_lif_set_features(struct ionic_lif *lif);
 
+void ionic_lif_get_stats(const struct ionic_lif *lif,
+       struct rte_eth_stats *stats);
+void ionic_lif_reset_stats(struct ionic_lif *lif);
+
+void ionic_lif_get_hw_stats(struct ionic_lif *lif,
+       struct ionic_lif_stats *stats);
+void ionic_lif_reset_hw_stats(struct ionic_lif *lif);
+
 int ionic_notifyq_handler(struct ionic_lif *lif, int budget);
 
 #endif /* _IONIC_LIF_H_ */