net/qede: fix per queue statisitics

If value of number of rxq/txq is different than
RTE_ETHDEV_QUEUE_STAT_CNTRS, limit per queue
stats/xstats to minimum of the two.

Fixes: 7634c5f91569 ("net/qede: add queue statistics")

Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 5263587..92527eb 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1162,6 +1162,7 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)
        struct ecore_dev *edev = &qdev->edev;
        struct ecore_eth_stats stats;
        unsigned int i = 0, j = 0, qid;
+       unsigned int rxq_stat_cntrs, txq_stat_cntrs;
        struct qede_tx_queue *txq;
 
        qdev->ops->get_vport_stats(edev, &stats);
@@ -1195,6 +1196,17 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)
        eth_stats->oerrors = stats.tx_err_drop_pkts;
 
        /* Queue stats */
+       rxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(qdev),
+                              RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       txq_stat_cntrs = RTE_MIN(QEDE_TSS_COUNT(qdev),
+                              RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       if ((rxq_stat_cntrs != QEDE_RSS_COUNT(qdev)) ||
+           (txq_stat_cntrs != QEDE_TSS_COUNT(qdev)))
+               DP_VERBOSE(edev, ECORE_MSG_DEBUG,
+                      "Not all the queue stats will be displayed. Set"
+                      " RTE_ETHDEV_QUEUE_STAT_CNTRS config param"
+                      " appropriately and retry.\n");
+
        for (qid = 0; qid < QEDE_QUEUE_CNT(qdev); qid++) {
                if (qdev->fp_array[qid].type & QEDE_FASTPATH_RX) {
                        eth_stats->q_ipackets[i] =
@@ -1213,7 +1225,11 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)
                                        rx_alloc_errors));
                        i++;
                }
+               if (i == rxq_stat_cntrs)
+                       break;
+       }
 
+       for (qid = 0; qid < QEDE_QUEUE_CNT(qdev); qid++) {
                if (qdev->fp_array[qid].type & QEDE_FASTPATH_TX) {
                        txq = qdev->fp_array[(qid)].txqs[0];
                        eth_stats->q_opackets[j] =
@@ -1223,13 +1239,17 @@ qede_get_stats(struct rte_eth_dev *eth_dev, struct rte_eth_stats *eth_stats)
                                                  xmit_pkts)));
                        j++;
                }
+               if (j == txq_stat_cntrs)
+                       break;
        }
 }
 
 static unsigned
 qede_get_xstats_count(struct qede_dev *qdev) {
        return RTE_DIM(qede_xstats_strings) +
-               (RTE_DIM(qede_rxq_xstats_strings) * QEDE_RSS_COUNT(qdev));
+               (RTE_DIM(qede_rxq_xstats_strings) *
+                RTE_MIN(QEDE_RSS_COUNT(qdev),
+                        RTE_ETHDEV_QUEUE_STAT_CNTRS));
 }
 
 static int
@@ -1239,6 +1259,7 @@ qede_get_xstats_names(__rte_unused struct rte_eth_dev *dev,
        struct qede_dev *qdev = dev->data->dev_private;
        const unsigned int stat_cnt = qede_get_xstats_count(qdev);
        unsigned int i, qid, stat_idx = 0;
+       unsigned int rxq_stat_cntrs;
 
        if (xstats_names != NULL) {
                for (i = 0; i < RTE_DIM(qede_xstats_strings); i++) {
@@ -1249,7 +1270,9 @@ qede_get_xstats_names(__rte_unused struct rte_eth_dev *dev,
                        stat_idx++;
                }
 
-               for (qid = 0; qid < QEDE_RSS_COUNT(qdev); qid++) {
+               rxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(qdev),
+                                        RTE_ETHDEV_QUEUE_STAT_CNTRS);
+               for (qid = 0; qid < rxq_stat_cntrs; qid++) {
                        for (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {
                                snprintf(xstats_names[stat_idx].name,
                                        sizeof(xstats_names[stat_idx].name),
@@ -1273,6 +1296,7 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
        struct ecore_eth_stats stats;
        const unsigned int num = qede_get_xstats_count(qdev);
        unsigned int i, qid, stat_idx = 0;
+       unsigned int rxq_stat_cntrs;
 
        if (n < num)
                return num;
@@ -1286,7 +1310,9 @@ qede_get_xstats(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
                stat_idx++;
        }
 
-       for (qid = 0; qid < QEDE_QUEUE_CNT(qdev); qid++) {
+       rxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(qdev),
+                                RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       for (qid = 0; qid < rxq_stat_cntrs; qid++) {
                if (qdev->fp_array[qid].type & QEDE_FASTPATH_RX) {
                        for (i = 0; i < RTE_DIM(qede_rxq_xstats_strings); i++) {
                                xstats[stat_idx].value = *(uint64_t *)(