git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ethdev: make stats and xstats reset callbacks return int
[dpdk.git] / drivers / net / bnxt / bnxt_stats.c
diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index c16bf99..049ad9e 100644 (file)
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -5,6 +5,7 @@
 
 #include <inttypes.h>
 
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 
 #include "bnxt.h"
@@ -350,6 +351,7 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
        int rc = 0;
        unsigned int i;
        struct bnxt *bp = eth_dev->data->dev_private;
+       unsigned int num_q_stats;
 
        memset(bnxt_stats, 0, sizeof(*bnxt_stats));
        if (!(bp->flags & BNXT_FLAG_INIT_DONE)) {
@@ -357,7 +359,10 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
                return -1;
        }
 
-       for (i = 0; i < bp->rx_cp_nr_rings; i++) {
+       num_q_stats = RTE_MIN(bp->rx_cp_nr_rings,
+                             (unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       for (i = 0; i < num_q_stats; i++) {
                struct bnxt_rx_queue *rxq = bp->rx_queues[i];
                struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
 
@@ -369,7 +374,10 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
                                rte_atomic64_read(&rxq->rx_mbuf_alloc_fail);
        }
 
-       for (i = 0; i < bp->tx_cp_nr_rings; i++) {
+       num_q_stats = RTE_MIN(bp->tx_cp_nr_rings,
+                             (unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       for (i = 0; i < num_q_stats; i++) {
                struct bnxt_tx_queue *txq = bp->tx_queues[i];
                struct bnxt_cp_ring_info *cpr = txq->cp_ring;
 
@@ -384,28 +392,31 @@ int bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
        return rc;
 }
 
-void bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
+int bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
 {
-       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt *bp = eth_dev->data->dev_private;
        unsigned int i;
+       int ret;
 
        if (!(bp->flags & BNXT_FLAG_INIT_DONE)) {
                PMD_DRV_LOG(ERR, "Device Initialization not complete!\n");
-               return;
+               return -EINVAL;
        }
 
-       bnxt_clear_all_hwrm_stat_ctxs(bp);
+       ret = bnxt_clear_all_hwrm_stat_ctxs(bp);
        for (i = 0; i < bp->rx_cp_nr_rings; i++) {
                struct bnxt_rx_queue *rxq = bp->rx_queues[i];
 
                rte_atomic64_clear(&rxq->rx_mbuf_alloc_fail);
        }
+
+       return ret;
 }
 
 int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
                           struct rte_eth_xstat *xstats, unsigned int n)
 {
-       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt *bp = eth_dev->data->dev_private;
 
        unsigned int count, i;
        uint64_t tx_drop_pkts;
@@ -414,11 +425,17 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
        unsigned int stat_size = sizeof(uint64_t);
        unsigned int stat_count;
 
+       memset(xstats, 0, sizeof(*xstats));
+
        bnxt_hwrm_port_qstats(bp);
        bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, &tx_drop_pkts);
        bnxt_hwrm_ext_port_qstats(bp);
-       rx_port_stats_ext_cnt = bp->fw_rx_port_stats_ext_size / stat_size;
-       tx_port_stats_ext_cnt = bp->fw_tx_port_stats_ext_size / stat_size;
+       rx_port_stats_ext_cnt = RTE_MIN(RTE_DIM(bnxt_rx_ext_stats_strings),
+                                       (bp->fw_rx_port_stats_ext_size /
+                                        stat_size));
+       tx_port_stats_ext_cnt = RTE_MIN(RTE_DIM(bnxt_tx_ext_stats_strings),
+                                       (bp->fw_tx_port_stats_ext_size /
+                                        stat_size));
 
        count = RTE_DIM(bnxt_rx_stats_strings) +
                RTE_DIM(bnxt_tx_stats_strings) + 1/* For tx_drop_pkts */ +
@@ -453,22 +470,22 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
        xstats[count].value = rte_le_to_cpu_64(tx_drop_pkts);
        count++;
 
-       for (i = 0; i < tx_port_stats_ext_cnt; i++) {
-               uint64_t *tx_stats_ext = (uint64_t *)bp->hw_tx_port_stats_ext;
+       for (i = 0; i < rx_port_stats_ext_cnt; i++) {
+               uint64_t *rx_stats_ext = (uint64_t *)bp->hw_rx_port_stats_ext;
 
                xstats[count].value = rte_le_to_cpu_64
-                                       (*(uint64_t *)((char *)tx_stats_ext +
-                                        bnxt_tx_ext_stats_strings[i].offset));
+                                       (*(uint64_t *)((char *)rx_stats_ext +
+                                        bnxt_rx_ext_stats_strings[i].offset));
 
                count++;
        }
 
-       for (i = 0; i < rx_port_stats_ext_cnt; i++) {
-               uint64_t *rx_stats_ext = (uint64_t *)bp->hw_rx_port_stats_ext;
+       for (i = 0; i < tx_port_stats_ext_cnt; i++) {
+               uint64_t *tx_stats_ext = (uint64_t *)bp->hw_tx_port_stats_ext;
 
                xstats[count].value = rte_le_to_cpu_64
-                                       (*(uint64_t *)((char *)rx_stats_ext +
-                                        bnxt_rx_ext_stats_strings[i].offset));
+                                       (*(uint64_t *)((char *)tx_stats_ext +
+                                        bnxt_tx_ext_stats_strings[i].offset));
 
                count++;
        }
@@ -491,41 +508,36 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev,
                count = 0;
 
                for (i = 0; i < RTE_DIM(bnxt_rx_stats_strings); i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               bnxt_rx_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               bnxt_rx_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
                for (i = 0; i < RTE_DIM(bnxt_tx_stats_strings); i++) {
-                       snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               bnxt_tx_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               bnxt_tx_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
                        count++;
                }
 
-               snprintf(xstats_names[count].name,
-                               sizeof(xstats_names[count].name),
-                               "%s",
-                               bnxt_func_stats_strings[4].name);
+               strlcpy(xstats_names[count].name,
+                       bnxt_func_stats_strings[4].name,
+                       sizeof(xstats_names[count].name));
                count++;
 
                for (i = 0; i < RTE_DIM(bnxt_rx_ext_stats_strings); i++) {
-                       snprintf(xstats_names[count].name,
-                                sizeof(xstats_names[count].name),
-                                "%s",
-                                bnxt_rx_ext_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               bnxt_rx_ext_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
 
                        count++;
                }
 
                for (i = 0; i < RTE_DIM(bnxt_tx_ext_stats_strings); i++) {
-                       snprintf(xstats_names[count].name,
-                                sizeof(xstats_names[count].name),
-                                "%s",
-                                bnxt_tx_ext_stats_strings[i].name);
+                       strlcpy(xstats_names[count].name,
+                               bnxt_tx_ext_stats_strings[i].name,
+                               sizeof(xstats_names[count].name));
 
                        count++;
                }
@@ -534,19 +546,36 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev,
        return stat_cnt;
 }
 
-void bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev)
+int bnxt_dev_xstats_reset_op(struct rte_eth_dev *eth_dev)
 {
-       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt *bp = eth_dev->data->dev_private;
+       int ret;
+
+       if (bp->flags & BNXT_FLAG_PORT_STATS && BNXT_SINGLE_PF(bp)) {
+               ret = bnxt_hwrm_port_clr_stats(bp);
+               if (ret != 0) {
+                       PMD_DRV_LOG(ERR, "Operation failed: %s\n",
+                                   strerror(-ret));
+                       return ret;
+               }
+       }
 
-       if (bp->flags & BNXT_FLAG_PORT_STATS && BNXT_SINGLE_PF(bp))
-               bnxt_hwrm_port_clr_stats(bp);
+       ret = 0;
 
-       if (BNXT_VF(bp))
+       if (BNXT_VF(bp)) {
                PMD_DRV_LOG(ERR, "Operation not supported on a VF device\n");
-       if (!BNXT_SINGLE_PF(bp))
+               ret = -ENOTSUP;
+       }
+       if (!BNXT_SINGLE_PF(bp)) {
                PMD_DRV_LOG(ERR, "Operation not supported on a MF device\n");
-       if (!(bp->flags & BNXT_FLAG_PORT_STATS))
+               ret = -ENOTSUP;
+       }
+       if (!(bp->flags & BNXT_FLAG_PORT_STATS)) {
                PMD_DRV_LOG(ERR, "Operation not supported\n");
+               ret = -ENOTSUP;
+       }
+
+       return ret;
 }
 
 int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids,
DPDK repo used for reviews