net/bnxt: support extended port counters

This patch adds support extended port statistics like COS bytes,
packets, XON -> XOFF and XOFF -> XON transitions in Tx and Rx path.

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index c580ec2..2b42639 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -250,6 +250,8 @@ struct bnxt {
 #define BNXT_FLAG_UPDATE_HASH  (1 << 5)
 #define BNXT_FLAG_PTP_SUPPORTED        (1 << 6)
 #define BNXT_FLAG_MULTI_HOST    (1 << 7)
+#define BNXT_FLAG_EXT_RX_PORT_STATS    (1 << 8)
+#define BNXT_FLAG_EXT_TX_PORT_STATS    (1 << 9)
 #define BNXT_FLAG_NEW_RM       (1 << 30)
 #define BNXT_FLAG_INIT_DONE    (1 << 31)
 #define BNXT_PF(bp)            (!((bp)->flags & BNXT_FLAG_VF))
@@ -264,6 +266,9 @@ struct bnxt {
        const void              *rx_mem_zone;
        struct rx_port_stats    *hw_rx_port_stats;
        rte_iova_t              hw_rx_port_stats_map;
+       struct rx_port_stats_ext    *hw_rx_port_stats_ext;
+       rte_iova_t              hw_rx_port_stats_ext_map;
+       uint16_t                fw_rx_port_stats_ext_size;
 
        unsigned int            tx_nr_rings;
        unsigned int            tx_cp_nr_rings;
@@ -271,6 +276,9 @@ struct bnxt {
        const void              *tx_mem_zone;
        struct tx_port_stats    *hw_tx_port_stats;
        rte_iova_t              hw_tx_port_stats_map;
+       struct tx_port_stats_ext    *hw_tx_port_stats_ext;
+       rte_iova_t              hw_tx_port_stats_ext_map;
+       uint16_t                fw_tx_port_stats_ext_size;
 
        /* Default completion ring */
        struct bnxt_cp_ring_info        *def_cp_ring;

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 8c156e2..07f5502 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3215,7 +3215,9 @@ skip_init:
                mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
                mz = rte_memzone_lookup(mz_name);
                total_alloc_len = RTE_CACHE_LINE_ROUNDUP(
-                               sizeof(struct rx_port_stats) + 512);
+                                       sizeof(struct rx_port_stats) +
+                                       sizeof(struct rx_port_stats_ext) +
+                                       512);
                if (!mz) {
                        mz = rte_memzone_reserve(mz_name, total_alloc_len,
                                        SOCKET_ID_ANY,
@@ -3251,7 +3253,9 @@ skip_init:
                mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
                mz = rte_memzone_lookup(mz_name);
                total_alloc_len = RTE_CACHE_LINE_ROUNDUP(
-                               sizeof(struct tx_port_stats) + 512);
+                                       sizeof(struct tx_port_stats) +
+                                       sizeof(struct tx_port_stats_ext) +
+                                       512);
                if (!mz) {
                        mz = rte_memzone_reserve(mz_name,
                                        total_alloc_len,
@@ -3282,8 +3286,30 @@ skip_init:
                bp->hw_tx_port_stats_map = mz_phys_addr;
 
                bp->flags |= BNXT_FLAG_PORT_STATS;
+
+               /* Display extended statistics if FW supports it */
+               if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_8_4 ||
+                   bp->hwrm_spec_code == HWRM_SPEC_CODE_1_9_0)
+                       goto skip_ext_stats;
+
+               bp->hw_rx_port_stats_ext = (void *)
+                       (bp->hw_rx_port_stats + sizeof(struct rx_port_stats));
+               bp->hw_rx_port_stats_ext_map = bp->hw_rx_port_stats_map +
+                       sizeof(struct rx_port_stats);
+               bp->flags |= BNXT_FLAG_EXT_RX_PORT_STATS;
+
+
+               if (bp->hwrm_spec_code < HWRM_SPEC_CODE_1_9_2) {
+                       bp->hw_tx_port_stats_ext = (void *)
+                       (bp->hw_tx_port_stats + sizeof(struct tx_port_stats));
+                       bp->hw_tx_port_stats_ext_map =
+                               bp->hw_tx_port_stats_map +
+                               sizeof(struct tx_port_stats);
+                       bp->flags |= BNXT_FLAG_EXT_TX_PORT_STATS;
+               }
        }
 
+skip_ext_stats:
        rc = bnxt_alloc_hwrm_resources(bp);
        if (rc) {
                PMD_DRV_LOG(ERR,

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index c682488..99ecdae 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -3945,3 +3945,47 @@ int bnxt_hwrm_set_ring_coal(struct bnxt *bp,
        HWRM_UNLOCK();
        return 0;
 }
+
+int bnxt_hwrm_ext_port_qstats(struct bnxt *bp)
+{
+       struct hwrm_port_qstats_ext_input req = {0};
+       struct hwrm_port_qstats_ext_output *resp = bp->hwrm_cmd_resp_addr;
+       struct bnxt_pf_info *pf = &bp->pf;
+       int rc;
+
+       if (!(bp->flags & BNXT_FLAG_EXT_RX_PORT_STATS ||
+             bp->flags & BNXT_FLAG_EXT_TX_PORT_STATS))
+               return 0;
+
+       HWRM_PREP(req, PORT_QSTATS_EXT);
+
+       req.port_id = rte_cpu_to_le_16(pf->port_id);
+       if (bp->flags & BNXT_FLAG_EXT_TX_PORT_STATS) {
+               req.tx_stat_host_addr =
+                       rte_cpu_to_le_64(bp->hw_tx_port_stats_map);
+               req.tx_stat_size =
+                       rte_cpu_to_le_16(sizeof(struct tx_port_stats_ext));
+       }
+       if (bp->flags & BNXT_FLAG_EXT_RX_PORT_STATS) {
+               req.rx_stat_host_addr =
+                       rte_cpu_to_le_64(bp->hw_rx_port_stats_map);
+               req.rx_stat_size =
+                       rte_cpu_to_le_16(sizeof(struct rx_port_stats_ext));
+       }
+       rc = bnxt_hwrm_send_message(bp, &req, sizeof(req));
+
+       if (rc) {
+               bp->fw_rx_port_stats_ext_size = 0;
+               bp->fw_tx_port_stats_ext_size = 0;
+       } else {
+               bp->fw_rx_port_stats_ext_size =
+                       rte_le_to_cpu_16(resp->rx_stat_size);
+               bp->fw_tx_port_stats_ext_size =
+                       rte_le_to_cpu_16(resp->tx_stat_size);
+       }
+
+       HWRM_CHECK_RESULT();
+       HWRM_UNLOCK();
+
+       return rc;
+}

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 379aac6..ec9b3e0 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -32,6 +32,10 @@ struct bnxt_cp_ring_info;
 #define HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESV_STRATEGY_MINIMAL_STATIC \
        HWRM_FUNC_RESOURCE_QCAPS_OUTPUT_VF_RESERVATION_STRATEGY_MINIMAL_STATIC
 
+#define HWRM_SPEC_CODE_1_8_4           0x10804
+#define HWRM_SPEC_CODE_1_9_0           0x10900
+#define HWRM_SPEC_CODE_1_9_2           0x10902
+
 int bnxt_hwrm_cfa_l2_clear_rx_mask(struct bnxt *bp,
                                   struct bnxt_vnic_info *vnic);
 int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, struct bnxt_vnic_info *vnic,
@@ -174,4 +178,5 @@ int bnxt_vnic_rss_configure(struct bnxt *bp,
 int bnxt_hwrm_set_ring_coal(struct bnxt *bp,
                        struct bnxt_coal *coal, uint16_t ring_id);
 int bnxt_hwrm_check_vf_rings(struct bnxt *bp);
+int bnxt_hwrm_ext_port_qstats(struct bnxt *bp);
 #endif

diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index f7e6ce4..c16bf99 100644 (file)
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -180,6 +180,150 @@ static const struct bnxt_xstats_name_off bnxt_func_stats_strings[] = {
                                rx_agg_aborts)},
 };
 
+static const struct bnxt_xstats_name_off bnxt_rx_ext_stats_strings[] = {
+       {"link_down_events", offsetof(struct rx_port_stats_ext,
+                               link_down_events)},
+       {"continuous_pause_events", offsetof(struct rx_port_stats_ext,
+                               continuous_pause_events)},
+       {"resume_pause_events", offsetof(struct rx_port_stats_ext,
+                               resume_pause_events)},
+       {"continuous_roce_pause_events", offsetof(struct rx_port_stats_ext,
+                               continuous_roce_pause_events)},
+       {"resume_roce_pause_events", offsetof(struct rx_port_stats_ext,
+                               resume_roce_pause_events)},
+       {"rx_bytes_cos0", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos0)},
+       {"rx_bytes_cos1", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos1)},
+       {"rx_bytes_cos2", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos2)},
+       {"rx_bytes_cos3", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos3)},
+       {"rx_bytes_cos4", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos4)},
+       {"rx_bytes_cos5", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos5)},
+       {"rx_bytes_cos6", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos6)},
+       {"rx_bytes_cos7", offsetof(struct rx_port_stats_ext,
+                               rx_bytes_cos7)},
+       {"rx_packets_cos0", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos0)},
+       {"rx_packets_cos1", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos1)},
+       {"rx_packets_cos2", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos2)},
+       {"rx_packets_cos3", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos3)},
+       {"rx_packets_cos4", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos4)},
+       {"rx_packets_cos5", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos5)},
+       {"rx_packets_cos6", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos6)},
+       {"rx_packets_cos7", offsetof(struct rx_port_stats_ext,
+                               rx_packets_cos7)},
+       {"pfc_pri0_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri0_rx_duration_us)},
+       {"pfc_pri0_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri0_rx_transitions)},
+       {"pfc_pri1_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri1_rx_duration_us)},
+       {"pfc_pri1_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri1_rx_transitions)},
+       {"pfc_pri2_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri2_rx_duration_us)},
+       {"pfc_pri2_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri2_rx_transitions)},
+       {"pfc_pri3_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri3_rx_duration_us)},
+       {"pfc_pri3_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri3_rx_transitions)},
+       {"pfc_pri4_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri4_rx_duration_us)},
+       {"pfc_pri4_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri4_rx_transitions)},
+       {"pfc_pri5_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri5_rx_duration_us)},
+       {"pfc_pri5_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri5_rx_transitions)},
+       {"pfc_pri6_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri6_rx_duration_us)},
+       {"pfc_pri6_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri6_rx_transitions)},
+       {"pfc_pri7_rx_duration_us", offsetof(struct rx_port_stats_ext,
+                               pfc_pri7_rx_duration_us)},
+       {"pfc_pri7_rx_transitions", offsetof(struct rx_port_stats_ext,
+                               pfc_pri7_rx_transitions)},
+};
+
+static const struct bnxt_xstats_name_off bnxt_tx_ext_stats_strings[] = {
+       {"tx_bytes_cos0", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos0)},
+       {"tx_bytes_cos1", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos1)},
+       {"tx_bytes_cos2", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos2)},
+       {"tx_bytes_cos3", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos3)},
+       {"tx_bytes_cos4", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos4)},
+       {"tx_bytes_cos5", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos5)},
+       {"tx_bytes_cos6", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos6)},
+       {"tx_bytes_cos7", offsetof(struct tx_port_stats_ext,
+                               tx_bytes_cos7)},
+       {"tx_packets_cos0", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos0)},
+       {"tx_packets_cos1", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos1)},
+       {"tx_packets_cos2", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos2)},
+       {"tx_packets_cos3", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos3)},
+       {"tx_packets_cos4", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos4)},
+       {"tx_packets_cos5", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos5)},
+       {"tx_packets_cos6", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos6)},
+       {"tx_packets_cos7", offsetof(struct tx_port_stats_ext,
+                               tx_packets_cos7)},
+       {"pfc_pri0_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri0_tx_duration_us)},
+       {"pfc_pri0_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri0_tx_transitions)},
+       {"pfc_pri1_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri1_tx_duration_us)},
+       {"pfc_pri1_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri1_tx_transitions)},
+       {"pfc_pri2_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri2_tx_duration_us)},
+       {"pfc_pri2_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri2_tx_transitions)},
+       {"pfc_pri3_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri3_tx_duration_us)},
+       {"pfc_pri3_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri3_tx_transitions)},
+       {"pfc_pri4_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri4_tx_duration_us)},
+       {"pfc_pri4_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri4_tx_transitions)},
+       {"pfc_pri5_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri5_tx_duration_us)},
+       {"pfc_pri5_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri5_tx_transitions)},
+       {"pfc_pri6_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri6_tx_duration_us)},
+       {"pfc_pri6_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri6_tx_transitions)},
+       {"pfc_pri7_tx_duration_us", offsetof(struct tx_port_stats_ext,
+                               pfc_pri7_tx_duration_us)},
+       {"pfc_pri7_tx_transitions", offsetof(struct tx_port_stats_ext,
+                               pfc_pri7_tx_transitions)},
+};
+
 /*
  * Statistics functions
  */
@@ -265,12 +409,22 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
 
        unsigned int count, i;
        uint64_t tx_drop_pkts;
+       unsigned int rx_port_stats_ext_cnt;
+       unsigned int tx_port_stats_ext_cnt;
+       unsigned int stat_size = sizeof(uint64_t);
+       unsigned int stat_count;
 
        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;
 
        count = RTE_DIM(bnxt_rx_stats_strings) +
-               RTE_DIM(bnxt_tx_stats_strings) + 1; /* For tx_drop_pkts */
+               RTE_DIM(bnxt_tx_stats_strings) + 1/* For tx_drop_pkts */ +
+               RTE_DIM(bnxt_rx_ext_stats_strings) +
+               RTE_DIM(bnxt_tx_ext_stats_strings);
+       stat_count = count;
 
        if (n < count)
                return count;
@@ -299,7 +453,27 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
        xstats[count].value = rte_le_to_cpu_64(tx_drop_pkts);
        count++;
 
-       return count;
+       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 *)tx_stats_ext +
+                                        bnxt_tx_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;
+
+               xstats[count].value = rte_le_to_cpu_64
+                                       (*(uint64_t *)((char *)rx_stats_ext +
+                                        bnxt_rx_ext_stats_strings[i].offset));
+
+               count++;
+       }
+
+       return stat_count;
 }
 
 int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev,
@@ -308,7 +482,9 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev,
 {
        /* Account for the Tx drop pkts aka the Anti spoof counter */
        const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) +
-                               RTE_DIM(bnxt_tx_stats_strings) + 1;
+                               RTE_DIM(bnxt_tx_stats_strings) + 1 +
+                               RTE_DIM(bnxt_rx_ext_stats_strings) +
+                               RTE_DIM(bnxt_tx_ext_stats_strings);
        unsigned int i, count;
 
        if (xstats_names != NULL) {
@@ -335,6 +511,25 @@ int bnxt_dev_xstats_get_names_op(__rte_unused struct rte_eth_dev *eth_dev,
                                "%s",
                                bnxt_func_stats_strings[4].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);
+
+                       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);
+
+                       count++;
+               }
+
        }
        return stat_cnt;
 }
@@ -359,7 +554,9 @@ int bnxt_dev_xstats_get_by_id_op(struct rte_eth_dev *dev, const uint64_t *ids,
 {
        /* Account for the Tx drop pkts aka the Anti spoof counter */
        const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) +
-                               RTE_DIM(bnxt_tx_stats_strings) + 1;
+                               RTE_DIM(bnxt_tx_stats_strings) + 1 +
+                               RTE_DIM(bnxt_rx_ext_stats_strings) +
+                               RTE_DIM(bnxt_tx_ext_stats_strings);
        struct rte_eth_xstat xstats[stat_cnt];
        uint64_t values_copy[stat_cnt];
        uint16_t i;
@@ -384,7 +581,9 @@ int bnxt_dev_xstats_get_names_by_id_op(struct rte_eth_dev *dev,
 {
        /* Account for the Tx drop pkts aka the Anti spoof counter */
        const unsigned int stat_cnt = RTE_DIM(bnxt_rx_stats_strings) +
-                               RTE_DIM(bnxt_tx_stats_strings) + 1;
+                               RTE_DIM(bnxt_tx_stats_strings) + 1 +
+                               RTE_DIM(bnxt_rx_ext_stats_strings) +
+                               RTE_DIM(bnxt_tx_ext_stats_strings);
        struct rte_eth_xstat_name xstats_names_copy[stat_cnt];
        uint16_t i;