net/bnxt: add statistics
authorAjit Khaparde <ajit.khaparde@broadcom.com>
Wed, 15 Jun 2016 21:23:12 +0000 (14:23 -0700)
committerBruce Richardson <bruce.richardson@intel.com>
Mon, 20 Jun 2016 15:21:51 +0000 (17:21 +0200)
Add the bnxt_stats_get_op() and bnxt_stats_reset_op() dev_ops to
get and reset statistics. It also brings in the associated HWRM calls
to handle the requests appropriately.

We also have the bnxt_free_stats() function which will be used in the
follow on patches to free the memory allocated by the driver for
statistics.

New HWRM calls:
bnxt_hwrm_stat_clear:
This command clears statistics of a context

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Stephen Hurd <stephen.hurd@broadcom.com>
Reviewed-by: David Christensen <david.christensen@broadcom.com>
drivers/net/bnxt/Makefile
drivers/net/bnxt/bnxt_cpr.c
drivers/net/bnxt/bnxt_cpr.h
drivers/net/bnxt/bnxt_ethdev.c
drivers/net/bnxt/bnxt_hwrm.c
drivers/net/bnxt/bnxt_hwrm.h
drivers/net/bnxt/bnxt_rxq.c
drivers/net/bnxt/bnxt_stats.c [new file with mode: 0644]
drivers/net/bnxt/bnxt_stats.h [new file with mode: 0644]
drivers/net/bnxt/bnxt_txq.c
drivers/net/bnxt/hsi_struct_def_dpdk.h

index 21ed71c..f6a04f8 100644 (file)
@@ -54,6 +54,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c
+SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c
 SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c
 
index 7de2b9c..5a4b13d 100644 (file)
@@ -35,6 +35,7 @@
 #include "bnxt_cpr.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
+#include "hsi_struct_def_dpdk.h"
 
 /*
  * Async event handling
index ecabc5f..2be22de 100644 (file)
@@ -34,8 +34,6 @@
 #ifndef _BNXT_CPR_H_
 #define _BNXT_CPR_H_
 
-#include "hsi_struct_def_dpdk.h"
-
 #define CMP_VALID(cmp, raw_cons, ring)                                 \
        (!!(((struct cmpl_base *)(cmp))->info3_v & CMPL_BASE_V) ==      \
         !((raw_cons) & ((ring)->ring_size)))
index 7e7d1ab..3453509 100644 (file)
@@ -42,6 +42,7 @@
 #include "bnxt.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_rxq.h"
+#include "bnxt_stats.h"
 #include "bnxt_txq.h"
 
 #define DRV_MODULE_NAME                "bnxt"
@@ -187,6 +188,8 @@ static struct eth_dev_ops bnxt_dev_ops = {
        .dev_infos_get = bnxt_dev_info_get_op,
        .dev_close = bnxt_dev_close_op,
        .dev_configure = bnxt_dev_configure_op,
+       .stats_get = bnxt_stats_get_op,
+       .stats_reset = bnxt_stats_reset_op,
        .rx_queue_setup = bnxt_rx_queue_setup_op,
        .rx_queue_release = bnxt_rx_queue_release_op,
        .tx_queue_setup = bnxt_tx_queue_setup_op,
index 65cd4a7..633683b 100644 (file)
 #include <rte_version.h>
 
 #include "bnxt.h"
+#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
+#include "bnxt_rxq.h"
+#include "bnxt_txq.h"
 #include "bnxt_vnic.h"
 #include "hsi_struct_def_dpdk.h"
 
@@ -480,10 +483,56 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)
        return rc;
 }
 
+int bnxt_hwrm_stat_clear(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)
+{
+       int rc = 0;
+       struct hwrm_stat_ctx_clr_stats_input req = {.req_type = 0 };
+       struct hwrm_stat_ctx_clr_stats_output *resp = bp->hwrm_cmd_resp_addr;
+
+       HWRM_PREP(req, STAT_CTX_CLR_STATS, -1, resp);
+
+       if (cpr->hw_stats_ctx_id == (uint32_t)HWRM_NA_SIGNATURE)
+               return rc;
+
+       req.stat_ctx_id = rte_cpu_to_le_16(cpr->hw_stats_ctx_id);
+       req.seq_id = rte_cpu_to_le_16(bp->hwrm_cmd_seq++);
+
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
+
+       HWRM_CHECK_RESULT;
+
+       return rc;
+}
+
 /*
  * HWRM utility functions
  */
 
+int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp)
+{
+       unsigned int i;
+       int rc = 0;
+
+       for (i = 0; i < bp->rx_cp_nr_rings + bp->tx_cp_nr_rings; i++) {
+               struct bnxt_tx_queue *txq;
+               struct bnxt_rx_queue *rxq;
+               struct bnxt_cp_ring_info *cpr;
+
+               if (i >= bp->rx_cp_nr_rings) {
+                       txq = bp->tx_queues[i - bp->rx_cp_nr_rings];
+                       cpr = txq->cp_ring;
+               } else {
+                       rxq = bp->rx_queues[i];
+                       cpr = rxq->cp_ring;
+               }
+
+               rc = bnxt_hwrm_stat_clear(bp, cpr);
+               if (rc)
+                       return rc;
+       }
+       return 0;
+}
+
 void bnxt_free_hwrm_resources(struct bnxt *bp)
 {
        /* Release memzone */
index bc6fb08..75c3442 100644 (file)
@@ -37,7 +37,9 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "bnxt.h"
+struct bnxt;
+struct bnxt_filter_info;
+struct bnxt_cp_ring_info;
 
 #define HWRM_SEQ_ID_INVALID -1U
 
@@ -56,8 +58,11 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags);
 
 int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);
 
+int bnxt_hwrm_stat_clear(struct bnxt *bp, struct bnxt_cp_ring_info *cpr);
+
 int bnxt_hwrm_ver_get(struct bnxt *bp);
 
+int bnxt_clear_all_hwrm_stat_ctxs(struct bnxt *bp);
 void bnxt_free_hwrm_resources(struct bnxt *bp);
 int bnxt_alloc_hwrm_resources(struct bnxt *bp);
 int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up);
index d5c3173..19c0e3f 100644 (file)
@@ -36,6 +36,7 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
+#include "bnxt_cpr.h"
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_ring.h"
diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
new file mode 100644 (file)
index 0000000..6f1c760
--- /dev/null
@@ -0,0 +1,142 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) Broadcom Limited.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Broadcom Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <inttypes.h>
+
+#include <rte_byteorder.h>
+
+#include "bnxt.h"
+#include "bnxt_cpr.h"
+#include "bnxt_hwrm.h"
+#include "bnxt_rxq.h"
+#include "bnxt_stats.h"
+#include "bnxt_txq.h"
+#include "hsi_struct_def_dpdk.h"
+
+/*
+ * Statistics functions
+ */
+
+void bnxt_free_stats(struct bnxt *bp)
+{
+       int i;
+
+       for (i = 0; i < (int)bp->tx_cp_nr_rings; i++) {
+               struct bnxt_tx_queue *txq = bp->tx_queues[i];
+
+               bnxt_free_txq_stats(txq);
+       }
+       for (i = 0; i < (int)bp->rx_cp_nr_rings; i++) {
+               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+
+               bnxt_free_rxq_stats(rxq);
+       }
+}
+
+void bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
+                          struct rte_eth_stats *bnxt_stats)
+{
+       unsigned int i;
+       struct bnxt *bp = eth_dev->data->dev_private;
+
+       memset(bnxt_stats, 0, sizeof(*bnxt_stats));
+
+       for (i = 0; i < bp->rx_cp_nr_rings; i++) {
+               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+               struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
+               struct ctx_hw_stats64 *hw_stats =
+                   (struct ctx_hw_stats64 *)cpr->hw_stats;
+
+               bnxt_stats->q_ipackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_ucast_pkts);
+               bnxt_stats->q_ipackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_mcast_pkts);
+               bnxt_stats->q_ipackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_bcast_pkts);
+
+               bnxt_stats->q_ibytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_ucast_bytes);
+               bnxt_stats->q_ibytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_mcast_bytes);
+               bnxt_stats->q_ibytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->rx_bcast_bytes);
+
+               /*
+                * TBD: No clear mapping to this... we don't seem
+                * to have a stat specifically for dropped due to
+                * insufficient mbufs.
+                */
+               bnxt_stats->q_errors[i] = 0;
+
+               /* These get replaced once the *_QSTATS commands work */
+               bnxt_stats->ipackets += bnxt_stats->q_ipackets[i];
+               bnxt_stats->ibytes += bnxt_stats->q_ibytes[i];
+               bnxt_stats->imissed += bnxt_stats->q_errors[i];
+               bnxt_stats->ierrors +=
+                               rte_le_to_cpu_64(hw_stats->rx_err_pkts);
+       }
+
+       for (i = 0; i < bp->tx_cp_nr_rings; i++) {
+               struct bnxt_tx_queue *txq = bp->tx_queues[i];
+               struct bnxt_cp_ring_info *cpr = txq->cp_ring;
+               struct ctx_hw_stats64 *hw_stats =
+                   (struct ctx_hw_stats64 *)cpr->hw_stats;
+
+               bnxt_stats->q_opackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_ucast_pkts);
+               bnxt_stats->q_opackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_mcast_pkts);
+               bnxt_stats->q_opackets[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_bcast_pkts);
+
+               bnxt_stats->q_obytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_ucast_bytes);
+               bnxt_stats->q_obytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_mcast_bytes);
+               bnxt_stats->q_obytes[i] +=
+                   rte_le_to_cpu_64(hw_stats->tx_bcast_bytes);
+
+               /* These get replaced once the *_QSTATS commands work */
+               bnxt_stats->opackets += bnxt_stats->q_opackets[i];
+               bnxt_stats->obytes +=  bnxt_stats->q_obytes[i];
+               bnxt_stats->oerrors += rte_le_to_cpu_64(hw_stats->tx_drop_pkts);
+               bnxt_stats->oerrors += rte_le_to_cpu_64(hw_stats->tx_err_pkts);
+       }
+}
+
+void bnxt_stats_reset_op(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+
+       bnxt_clear_all_hwrm_stat_ctxs(bp);
+}
diff --git a/drivers/net/bnxt/bnxt_stats.h b/drivers/net/bnxt/bnxt_stats.h
new file mode 100644 (file)
index 0000000..65408a4
--- /dev/null
@@ -0,0 +1,44 @@
+/*-
+ *   BSD LICENSE
+ *
+ *   Copyright(c) 2014-2015 Broadcom Corporation.
+ *   All rights reserved.
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
+ *   are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *     * Neither the name of Broadcom Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _BNXT_STATS_H_
+#define _BNXT_STATS_H_
+
+#include <rte_ethdev.h>
+
+void bnxt_free_stats(struct bnxt *bp);
+void bnxt_stats_get_op(struct rte_eth_dev *eth_dev,
+                          struct rte_eth_stats *bnxt_stats);
+void bnxt_stats_reset_op(struct rte_eth_dev *eth_dev);
+
+#endif
index 8928984..8793c9d 100644 (file)
@@ -36,6 +36,7 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
+#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 
index bbec5bb..91a83d1 100644 (file)
 #ifndef _HSI_STRUCT_DEF_EXTERNAL_H_
 #define _HSI_STRUCT_DEF_EXTERNAL_H_
 
+/*
+ * per-context HW statistics -- chip view
+ */
+
+struct ctx_hw_stats64 {
+       uint64_t rx_ucast_pkts;
+       uint64_t rx_mcast_pkts;
+       uint64_t rx_bcast_pkts;
+       uint64_t rx_drop_pkts;
+       uint64_t rx_err_pkts;
+       uint64_t rx_ucast_bytes;
+       uint64_t rx_mcast_bytes;
+       uint64_t rx_bcast_bytes;
+
+       uint64_t tx_ucast_pkts;
+       uint64_t tx_mcast_pkts;
+       uint64_t tx_bcast_pkts;
+       uint64_t tx_drop_pkts;
+       uint64_t tx_err_pkts;
+       uint64_t tx_ucast_bytes;
+       uint64_t tx_mcast_bytes;
+       uint64_t tx_bcast_bytes;
+
+       uint64_t tpa_pkts;
+       uint64_t tpa_bytes;
+       uint64_t tpa_events;
+       uint64_t tpa_aborts;
+} ctx_hw_stats64_t;
+
 /* HW Resource Manager Specification 1.2.0 */
 #define HWRM_VERSION_MAJOR     1
 #define HWRM_VERSION_MINOR     2
@@ -63,6 +92,7 @@
 #define HWRM_CFA_L2_FILTER_FREE                (UINT32_C(0x91))
 #define HWRM_CFA_L2_FILTER_CFG         (UINT32_C(0x92))
 #define HWRM_CFA_L2_SET_RX_MASK                (UINT32_C(0x93))
+#define HWRM_STAT_CTX_CLR_STATS                (UINT32_C(0xb3))
 #define HWRM_EXEC_FWD_RESP             (UINT32_C(0xd0))
 
 /* Return Codes */
@@ -1897,6 +1927,83 @@ struct hwrm_queue_qportcfg_input {
        uint16_t unused_0;
 } __attribute__((packed));
 
+/* hwrm_stat_ctx_clr_stats */
+/* Description: This command clears statistics of a context. */
+
+/* Input (24 bytes) */
+struct hwrm_stat_ctx_clr_stats_input {
+       /*
+        * This value indicates what type of request this is. The format for the
+        * rest of the command is determined by this field.
+        */
+       uint16_t req_type;
+
+       /*
+        * This value indicates the what completion ring the request will be
+        * optionally completed on. If the value is -1, then no CR completion
+        * will be generated. Any other value must be a valid CR ring_id value
+        * for this function.
+        */
+       uint16_t cmpl_ring;
+
+       /* This value indicates the command sequence number. */
+       uint16_t seq_id;
+
+       /*
+        * Target ID of this command. 0x0 - 0xFFF8 - Used for function ids
+        * 0xFFF8 - 0xFFFE - Reserved for internal processors 0xFFFF - HWRM
+        */
+       uint16_t target_id;
+
+       /*
+        * This is the host address where the response will be written when the
+        * request is complete. This area must be 16B aligned and must be
+        * cleared to zero before the request is made.
+        */
+       uint64_t resp_addr;
+
+       /* ID of the statistics context that is being queried. */
+       uint32_t stat_ctx_id;
+
+       uint32_t unused_0;
+} __attribute__((packed));
+
+/* Output (16 bytes) */
+struct hwrm_stat_ctx_clr_stats_output {
+       /*
+        * Pass/Fail or error type Note: receiver to verify the in parameters,
+        * and fail the call with an error when appropriate
+        */
+       uint16_t error_code;
+
+       /* This field returns the type of original request. */
+       uint16_t req_type;
+
+       /* This field provides original sequence number of the command. */
+       uint16_t seq_id;
+
+       /*
+        * This field is the length of the response in bytes. The last byte of
+        * the response is a valid flag that will read as '1' when the command
+        * has been completely written to memory.
+        */
+       uint16_t resp_len;
+
+       uint32_t unused_0;
+       uint8_t unused_1;
+       uint8_t unused_2;
+       uint8_t unused_3;
+
+       /*
+        * This field is used in Output records to indicate that the output is
+        * completely written to RAM. This field should be read as '1' to
+        * indicate that the output has been completely written. When writing a
+        * command completion or response to an internal processor, the order of
+        * writes has to be such that this field is written last.
+        */
+       uint8_t valid;
+} __attribute__((packed));
+
 /* hwrm_vnic_rss_cfg */
 /* Description: This function is used to enable RSS configuration. */