From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1A6CA0613 for ; Thu, 26 Sep 2019 16:08:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9229E2C60; Thu, 26 Sep 2019 16:06:06 +0200 (CEST) Received: from huawei.com (szxga04-in.huawei.com [45.249.212.190]) by dpdk.org (Postfix) with ESMTP id E2FB31BE96 for ; Thu, 26 Sep 2019 16:04:59 +0200 (CEST) Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 75AC3361E8C655F1CDC8; Thu, 26 Sep 2019 22:04:58 +0800 (CST) Received: from localhost.localdomain (10.67.212.132) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.439.0; Thu, 26 Sep 2019 22:04:48 +0800 From: "Wei Hu (Xavier)" To: CC: , , , Date: Thu, 26 Sep 2019 22:02:06 +0800 Message-ID: <1569506528-60464-21-git-send-email-xavier.huwei@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1569506528-60464-1-git-send-email-xavier.huwei@huawei.com> References: <1569506528-60464-1-git-send-email-xavier.huwei@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.212.132] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v3 20/22] net/hns3: add stats related ops for hns3 PMD driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds stats_get, stats_reset, xstats_get, xstats_get_names xstats_reset, xstats_get_by_id and xstats_get_names_by_id related function codes. Signed-off-by: Wei Hu (Xavier) Signed-off-by: Hao Chen Signed-off-by: Chunsong Feng Signed-off-by: Min Hu (Connor) Signed-off-by: Huisong Li --- v1 -> v2: Address Ferruh Yigit's comments as follows: https://inbox.dpdk.org/dev/13ad540e-ca60-e304-352b-b33ca1ebb6ea@intel.com --- doc/guides/nics/features/hns3.ini | 3 + doc/guides/nics/features/hns3_vf.ini | 3 + drivers/net/hns3/Makefile | 1 + drivers/net/hns3/hns3_ethdev.c | 7 + drivers/net/hns3/hns3_ethdev.h | 4 + drivers/net/hns3/hns3_ethdev_vf.c | 8 + drivers/net/hns3/hns3_stats.c | 975 +++++++++++++++++++++++++++++++++++ drivers/net/hns3/hns3_stats.h | 152 ++++++ drivers/net/hns3/meson.build | 1 + 9 files changed, 1154 insertions(+) create mode 100644 drivers/net/hns3/hns3_stats.c create mode 100644 drivers/net/hns3/hns3_stats.h diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini index 90b7e29..308048c 100644 --- a/doc/guides/nics/features/hns3.ini +++ b/doc/guides/nics/features/hns3.ini @@ -25,6 +25,9 @@ L3 checksum offload = Y L4 checksum offload = Y Inner L3 checksum = Y Inner L4 checksum = Y +Basic stats = Y +Extended stats = Y +Stats per queue = Y FW version = Y Linux UIO = Y Linux VFIO = Y diff --git a/doc/guides/nics/features/hns3_vf.ini b/doc/guides/nics/features/hns3_vf.ini index 5fddfa5..a152ca5 100644 --- a/doc/guides/nics/features/hns3_vf.ini +++ b/doc/guides/nics/features/hns3_vf.ini @@ -21,6 +21,9 @@ L3 checksum offload = Y L4 checksum offload = Y Inner L3 checksum = Y Inner L4 checksum = Y +Basic stats = Y +Extended stats = Y +Stats per queue = Y Linux UIO = Y Linux VFIO = Y ARMv8 = Y diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile index 45a39b9..fede05d 100644 --- a/drivers/net/hns3/Makefile +++ b/drivers/net/hns3/Makefile @@ -31,6 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c +SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 3a2f2df..220be21 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4190,6 +4190,13 @@ static const struct eth_dev_ops hns3_eth_dev_ops = { .allmulticast_enable = hns3_dev_allmulticast_enable, .allmulticast_disable = hns3_dev_allmulticast_disable, .mtu_set = hns3_dev_mtu_set, + .stats_get = hns3_stats_get, + .stats_reset = hns3_stats_reset, + .xstats_get = hns3_dev_xstats_get, + .xstats_get_names = hns3_dev_xstats_get_names, + .xstats_reset = hns3_dev_xstats_reset, + .xstats_get_by_id = hns3_dev_xstats_get_by_id, + .xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id, .dev_infos_get = hns3_dev_infos_get, .fw_version_get = hns3_fw_version_get, .rx_queue_setup = hns3_rx_queue_setup, diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 2a79e6e..c907a35 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -12,6 +12,7 @@ #include "hns3_mbx.h" #include "hns3_rss.h" #include "hns3_fdir.h" +#include "hns3_stats.h" /* Vendor ID */ #define PCI_VENDOR_ID_HUAWEI 0x19e5 @@ -338,6 +339,9 @@ struct hns3_hw { pthread_t irq_thread_id; struct hns3_mac mac; unsigned int secondary_cnt; /* Number of secondary processes init'd. */ + struct hns3_tqp_stats tqp_stats; + /* Include Mac stats | Rx stats | Tx stats */ + struct hns3_mac_stats mac_stats; uint32_t fw_version; uint16_t num_msi; diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 9da42a5..e20cfc5 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -952,6 +952,7 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev) hns3_set_default_rss_args(hw); + (void)hns3_stats_reset(eth_dev); return 0; err_get_config: @@ -1123,6 +1124,13 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = { .dev_stop = hns3vf_dev_stop, .dev_close = hns3vf_dev_close, .mtu_set = hns3vf_dev_mtu_set, + .stats_get = hns3_stats_get, + .stats_reset = hns3_stats_reset, + .xstats_get = hns3_dev_xstats_get, + .xstats_get_names = hns3_dev_xstats_get_names, + .xstats_reset = hns3_dev_xstats_reset, + .xstats_get_by_id = hns3_dev_xstats_get_by_id, + .xstats_get_names_by_id = hns3_dev_xstats_get_names_by_id, .dev_infos_get = hns3vf_dev_infos_get, .rx_queue_setup = hns3_rx_queue_setup, .tx_queue_setup = hns3_tx_queue_setup, diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c new file mode 100644 index 0000000..a0252ea --- /dev/null +++ b/drivers/net/hns3/hns3_stats.c @@ -0,0 +1,975 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018-2019 Hisilicon Limited. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "hns3_ethdev.h" +#include "hns3_rxtx.h" +#include "hns3_logs.h" + +/* MAC statistics */ +static const struct hns3_xstats_name_offset hns3_mac_strings[] = { + {"mac_tx_mac_pause_num", + HNS3_MAC_STATS_OFFSET(mac_tx_mac_pause_num)}, + {"mac_rx_mac_pause_num", + HNS3_MAC_STATS_OFFSET(mac_rx_mac_pause_num)}, + {"mac_tx_control_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_ctrl_pkt_num)}, + {"mac_rx_control_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_ctrl_pkt_num)}, + {"mac_tx_pfc_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pause_pkt_num)}, + {"mac_tx_pfc_pri0_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri0_pkt_num)}, + {"mac_tx_pfc_pri1_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri1_pkt_num)}, + {"mac_tx_pfc_pri2_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri2_pkt_num)}, + {"mac_tx_pfc_pri3_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri3_pkt_num)}, + {"mac_tx_pfc_pri4_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri4_pkt_num)}, + {"mac_tx_pfc_pri5_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri5_pkt_num)}, + {"mac_tx_pfc_pri6_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri6_pkt_num)}, + {"mac_tx_pfc_pri7_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_pfc_pri7_pkt_num)}, + {"mac_rx_pfc_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pause_pkt_num)}, + {"mac_rx_pfc_pri0_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri0_pkt_num)}, + {"mac_rx_pfc_pri1_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri1_pkt_num)}, + {"mac_rx_pfc_pri2_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri2_pkt_num)}, + {"mac_rx_pfc_pri3_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri3_pkt_num)}, + {"mac_rx_pfc_pri4_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri4_pkt_num)}, + {"mac_rx_pfc_pri5_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri5_pkt_num)}, + {"mac_rx_pfc_pri6_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri6_pkt_num)}, + {"mac_rx_pfc_pri7_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_pfc_pri7_pkt_num)}, + {"mac_tx_total_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_total_pkt_num)}, + {"mac_tx_total_oct_num", + HNS3_MAC_STATS_OFFSET(mac_tx_total_oct_num)}, + {"mac_tx_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_good_pkt_num)}, + {"mac_tx_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_bad_pkt_num)}, + {"mac_tx_good_oct_num", + HNS3_MAC_STATS_OFFSET(mac_tx_good_oct_num)}, + {"mac_tx_bad_oct_num", + HNS3_MAC_STATS_OFFSET(mac_tx_bad_oct_num)}, + {"mac_tx_uni_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_uni_pkt_num)}, + {"mac_tx_multi_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_multi_pkt_num)}, + {"mac_tx_broad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_broad_pkt_num)}, + {"mac_tx_undersize_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_undersize_pkt_num)}, + {"mac_tx_oversize_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_oversize_pkt_num)}, + {"mac_tx_64_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_64_oct_pkt_num)}, + {"mac_tx_65_127_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_65_127_oct_pkt_num)}, + {"mac_tx_128_255_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_128_255_oct_pkt_num)}, + {"mac_tx_256_511_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_256_511_oct_pkt_num)}, + {"mac_tx_512_1023_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_512_1023_oct_pkt_num)}, + {"mac_tx_1024_1518_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_1024_1518_oct_pkt_num)}, + {"mac_tx_1519_2047_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_1519_2047_oct_pkt_num)}, + {"mac_tx_2048_4095_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_2048_4095_oct_pkt_num)}, + {"mac_tx_4096_8191_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_4096_8191_oct_pkt_num)}, + {"mac_tx_8192_9216_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_8192_9216_oct_pkt_num)}, + {"mac_tx_9217_12287_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_9217_12287_oct_pkt_num)}, + {"mac_tx_12288_16383_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_12288_16383_oct_pkt_num)}, + {"mac_tx_1519_max_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_1519_max_good_oct_pkt_num)}, + {"mac_tx_1519_max_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_1519_max_bad_oct_pkt_num)}, + {"mac_rx_total_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_total_pkt_num)}, + {"mac_rx_total_oct_num", + HNS3_MAC_STATS_OFFSET(mac_rx_total_oct_num)}, + {"mac_rx_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_good_pkt_num)}, + {"mac_rx_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_bad_pkt_num)}, + {"mac_rx_good_oct_num", + HNS3_MAC_STATS_OFFSET(mac_rx_good_oct_num)}, + {"mac_rx_bad_oct_num", + HNS3_MAC_STATS_OFFSET(mac_rx_bad_oct_num)}, + {"mac_rx_uni_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_uni_pkt_num)}, + {"mac_rx_multi_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_multi_pkt_num)}, + {"mac_rx_broad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_broad_pkt_num)}, + {"mac_rx_undersize_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_undersize_pkt_num)}, + {"mac_rx_oversize_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_oversize_pkt_num)}, + {"mac_rx_64_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_64_oct_pkt_num)}, + {"mac_rx_65_127_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_65_127_oct_pkt_num)}, + {"mac_rx_128_255_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_128_255_oct_pkt_num)}, + {"mac_rx_256_511_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_256_511_oct_pkt_num)}, + {"mac_rx_512_1023_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_512_1023_oct_pkt_num)}, + {"mac_rx_1024_1518_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_1024_1518_oct_pkt_num)}, + {"mac_rx_1519_2047_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_1519_2047_oct_pkt_num)}, + {"mac_rx_2048_4095_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_2048_4095_oct_pkt_num)}, + {"mac_rx_4096_8191_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_4096_8191_oct_pkt_num)}, + {"mac_rx_8192_9216_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_8192_9216_oct_pkt_num)}, + {"mac_rx_9217_12287_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_9217_12287_oct_pkt_num)}, + {"mac_rx_12288_16383_oct_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_12288_16383_oct_pkt_num)}, + {"mac_rx_1519_max_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_1519_max_good_oct_pkt_num)}, + {"mac_rx_1519_max_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_1519_max_bad_oct_pkt_num)}, + {"mac_tx_fragment_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_fragment_pkt_num)}, + {"mac_tx_undermin_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_undermin_pkt_num)}, + {"mac_tx_jabber_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_jabber_pkt_num)}, + {"mac_tx_err_all_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_err_all_pkt_num)}, + {"mac_tx_from_app_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_from_app_good_pkt_num)}, + {"mac_tx_from_app_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_tx_from_app_bad_pkt_num)}, + {"mac_rx_fragment_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_fragment_pkt_num)}, + {"mac_rx_undermin_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_undermin_pkt_num)}, + {"mac_rx_jabber_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_jabber_pkt_num)}, + {"mac_rx_fcs_err_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_fcs_err_pkt_num)}, + {"mac_rx_send_app_good_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_send_app_good_pkt_num)}, + {"mac_rx_send_app_bad_pkt_num", + HNS3_MAC_STATS_OFFSET(mac_rx_send_app_bad_pkt_num)} +}; + +static const struct hns3_xstats_name_offset hns3_error_int_stats_strings[] = { + {"MAC_AFIFO_TNL_INT_R", + HNS3_ERR_INT_STATS_FIELD_OFFSET(mac_afifo_tnl_intr_cnt)}, + {"PPU_MPF_ABNORMAL_INT_ST2", + HNS3_ERR_INT_STATS_FIELD_OFFSET(ppu_mpf_abnormal_intr_st2_cnt)}, + {"SSU_PORT_BASED_ERR_INT", + HNS3_ERR_INT_STATS_FIELD_OFFSET(ssu_port_based_pf_intr_cnt)}, + {"PPP_PF_ABNORMAL_INT_ST0", + HNS3_ERR_INT_STATS_FIELD_OFFSET(ppp_pf_abnormal_intr_cnt)}, + {"PPU_PF_ABNORMAL_INT_ST", + HNS3_ERR_INT_STATS_FIELD_OFFSET(ppu_pf_abnormal_intr_cnt)} +}; + +/* The statistic of reset */ +static const struct hns3_xstats_name_offset hns3_reset_stats_strings[] = { + {"REQ_RESET_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(request_cnt)}, + {"GLOBAL_RESET_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(global_cnt)}, + {"IMP_RESET_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(imp_cnt)}, + {"RESET_EXEC_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(exec_cnt)}, + {"RESET_SUCCESS_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(success_cnt)}, + {"RESET_FAIL_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(fail_cnt)}, + {"RESET_MERGE_CNT", + HNS3_RESET_STATS_FIELD_OFFSET(merge_cnt)} +}; + +/* The statistic of errors in Rx BD */ +static const struct hns3_xstats_name_offset hns3_rx_bd_error_strings[] = { + {"NONE_VALIDATED_DESCRIPTORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(non_vld_descs)}, + {"RX_PKT_LEN_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(pkt_len_errors)}, + {"L2_RX_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(l2_errors)}, + {"RX_L3_CHECKSUM_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(l3_csum_erros)}, + {"RX_L4_CHECKSUM_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(l4_csum_erros)}, + {"RX_OL3_CHECKSUM_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(ol3_csum_erros)}, + {"RX_OL4_CHECKSUM_ERRORS", + HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(ol4_csum_erros)} +}; + +/* The statistic of errors in Tx */ +static const struct hns3_xstats_name_offset hns3_tx_error_strings[] = { + {"TX_PKT_LEN_ERRORS", + HNS3_TX_ERROR_STATS_FIELD_OFFSET(pkt_len_errors)} +}; + +#define HNS3_NUM_MAC_STATS (sizeof(hns3_mac_strings) / \ + sizeof(hns3_mac_strings[0])) + +#define HNS3_NUM_ERROR_INT_XSTATS (sizeof(hns3_error_int_stats_strings) / \ + sizeof(hns3_error_int_stats_strings[0])) + +#define HNS3_NUM_RESET_XSTATS (sizeof(hns3_reset_stats_strings) / \ + sizeof(hns3_reset_stats_strings[0])) + +#define HNS3_NUM_RX_BD_ERROR_XSTATS (sizeof(hns3_rx_bd_error_strings) / \ + sizeof(hns3_rx_bd_error_strings[0])) + +#define HNS3_NUM_TX_ERROR_XSTATS (sizeof(hns3_tx_error_strings) / \ + sizeof(hns3_tx_error_strings[0])) + +#define HNS3_FIX_NUM_STATS (HNS3_NUM_MAC_STATS + HNS3_NUM_ERROR_INT_XSTATS + \ + HNS3_NUM_RESET_XSTATS) + +/* + * Query all the MAC statistics data of Network ICL command ,opcode id: 0x0034. + * This command is used before send 'query_mac_stat command', the descriptor + * number of 'query_mac_stat command' must match with reg_num in this command. + * @praram hw + * Pointer to structure hns3_hw. + * @return + * 0 on success. + */ +static int +hns3_update_mac_stats(struct hns3_hw *hw, const uint32_t desc_num) +{ + uint64_t *data = (uint64_t *)(&hw->mac_stats); + struct hns3_cmd_desc *desc; + uint64_t *desc_data; + uint16_t i, k, n; + int ret; + + desc = rte_malloc("hns3_mac_desc", + desc_num * sizeof(struct hns3_cmd_desc), 0); + if (desc == NULL) { + hns3_err(hw, "Mac_update_stats alloced desc malloc fail"); + return -ENOMEM; + } + + hns3_cmd_setup_basic_desc(desc, HNS3_OPC_STATS_MAC_ALL, true); + ret = hns3_cmd_send(hw, desc, desc_num); + if (ret) { + hns3_err(hw, "Update complete MAC pkt stats fail : %d", ret); + rte_free(desc); + return ret; + } + + for (i = 0; i < desc_num; i++) { + /* For special opcode 0034, only the first desc has the head */ + if (i == 0) { + desc_data = (uint64_t *)(&desc[i].data[0]); + n = HNS3_RD_FIRST_STATS_NUM; + } else { + desc_data = (uint64_t *)(&desc[i]); + n = HNS3_RD_OTHER_STATS_NUM; + } + + for (k = 0; k < n; k++) { + *data += rte_le_to_cpu_64(*desc_data); + data++; + desc_data++; + } + } + rte_free(desc); + + return 0; +} + +/* + * Query Mac stat reg num command ,opcode id: 0x0033. + * This command is used before send 'query_mac_stat command', the descriptor + * number of 'query_mac_stat command' must match with reg_num in this command. + * @praram rte_stats + * Pointer to structure rte_eth_stats. + * @return + * 0 on success. + */ +static int +hns3_mac_query_reg_num(struct rte_eth_dev *dev, uint32_t *desc_num) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + struct hns3_cmd_desc desc; + uint32_t *desc_data; + uint32_t reg_num; + int ret; + + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_MAC_REG_NUM, true); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) + return ret; + + /* + * The num of MAC statistics registers that are provided by IMP in this + * version. + */ + desc_data = (uint32_t *)(&desc.data[0]); + reg_num = rte_le_to_cpu_32(*desc_data); + + /* + * The descriptor number of 'query_additional_mac_stat command' is + * '1 + (reg_num-3)/4 + ((reg_num-3)%4 !=0)'; + * This value is 83 in this version + */ + *desc_num = 1 + ((reg_num - 3) >> 2) + + (uint32_t)(((reg_num - 3) & 0x3) ? 1 : 0); + + return 0; +} + +static int +hns3_query_update_mac_stats(struct rte_eth_dev *dev) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + uint32_t desc_num; + int ret; + + ret = hns3_mac_query_reg_num(dev, &desc_num); + if (ret == 0) + ret = hns3_update_mac_stats(hw, desc_num); + else + hns3_err(hw, "Query mac reg num fail : %d", ret); + return ret; +} + +/* Get tqp stats from register */ +static int +hns3_update_tqp_stats(struct hns3_hw *hw) +{ + struct hns3_tqp_stats *stats = &hw->tqp_stats; + struct hns3_cmd_desc desc; + uint64_t cnt; + uint16_t i; + int ret; + + for (i = 0; i < hw->tqps_num; i++) { + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_RX_STATUS, + true); + + desc.data[0] = rte_cpu_to_le_32((uint32_t)i & + HNS3_QUEUE_ID_MASK); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) { + hns3_err(hw, "Failed to query RX No.%d queue stat: %d", + i, ret); + return ret; + } + cnt = rte_le_to_cpu_32(desc.data[1]); + stats->rcb_rx_ring_pktnum_rcd += cnt; + stats->rcb_rx_ring_pktnum[i] += cnt; + + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_TX_STATUS, + true); + + desc.data[0] = rte_cpu_to_le_32((uint32_t)i & + HNS3_QUEUE_ID_MASK); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) { + hns3_err(hw, "Failed to query TX No.%d queue stat: %d", + i, ret); + return ret; + } + cnt = rte_le_to_cpu_32(desc.data[1]); + stats->rcb_tx_ring_pktnum_rcd += cnt; + stats->rcb_tx_ring_pktnum[i] += cnt; + } + + return 0; +} + +/* + * Query tqp tx queue statistics ,opcode id: 0x0B03. + * Query tqp rx queue statistics ,opcode id: 0x0B13. + * Get all statistics of a port. + * @param eth_dev + * Pointer to Ethernet device. + * @praram rte_stats + * Pointer to structure rte_eth_stats. + * @return + * 0 on success. + */ +int +hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats) +{ + struct hns3_adapter *hns = eth_dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + struct hns3_tqp_stats *stats = &hw->tqp_stats; + struct hns3_rx_queue *rxq; + uint64_t cnt; + uint64_t num; + uint16_t i; + int ret; + + /* Update tqp stats by read register */ + ret = hns3_update_tqp_stats(hw); + if (ret) { + hns3_err(hw, "Update tqp stats fail : %d", ret); + return ret; + } + + rte_stats->ipackets = stats->rcb_rx_ring_pktnum_rcd; + rte_stats->opackets = stats->rcb_tx_ring_pktnum_rcd; + rte_stats->rx_nombuf = eth_dev->data->rx_mbuf_alloc_failed; + + num = RTE_MIN(RTE_ETHDEV_QUEUE_STAT_CNTRS, hw->tqps_num); + for (i = 0; i < num; i++) { + rte_stats->q_ipackets[i] = stats->rcb_rx_ring_pktnum[i]; + rte_stats->q_opackets[i] = stats->rcb_tx_ring_pktnum[i]; + } + + num = RTE_MIN(RTE_ETHDEV_QUEUE_STAT_CNTRS, eth_dev->data->nb_rx_queues); + for (i = 0; i != num; ++i) { + rxq = eth_dev->data->rx_queues[i]; + if (rxq) { + cnt = rxq->errors; + rte_stats->q_errors[i] = cnt; + rte_stats->ierrors += cnt; + } + } + + return 0; +} + +int +hns3_stats_reset(struct rte_eth_dev *eth_dev) +{ + struct hns3_adapter *hns = eth_dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + struct hns3_tqp_stats *stats = &hw->tqp_stats; + struct hns3_cmd_desc desc_reset; + struct hns3_rx_queue *rxq; + struct hns3_tx_queue *txq; + uint16_t i; + int ret; + + /* + * If this is a reset xstats is NULL, and we have cleared the + * registers by reading them. + */ + for (i = 0; i < hw->tqps_num; i++) { + hns3_cmd_setup_basic_desc(&desc_reset, HNS3_OPC_QUERY_RX_STATUS, + true); + desc_reset.data[0] = rte_cpu_to_le_32((uint32_t)i & + HNS3_QUEUE_ID_MASK); + ret = hns3_cmd_send(hw, &desc_reset, 1); + if (ret) { + hns3_err(hw, "Failed to reset RX No.%d queue stat: %d", + i, ret); + } + + hns3_cmd_setup_basic_desc(&desc_reset, HNS3_OPC_QUERY_TX_STATUS, + true); + desc_reset.data[0] = rte_cpu_to_le_32((uint32_t)i & + HNS3_QUEUE_ID_MASK); + ret = hns3_cmd_send(hw, &desc_reset, 1); + if (ret) { + hns3_err(hw, "Failed to reset TX No.%d queue stat: %d", + i, ret); + } + } + + /* Clear Rx BD and Tx error stats */ + for (i = 0; i != eth_dev->data->nb_rx_queues; ++i) { + rxq = eth_dev->data->rx_queues[i]; + if (rxq) { + rxq->pkt_len_errors = 0; + rxq->non_vld_descs = 0; + rxq->l2_errors = 0; + rxq->l3_csum_erros = 0; + rxq->l4_csum_erros = 0; + rxq->ol3_csum_erros = 0; + rxq->ol4_csum_erros = 0; + rxq->errors = 0; + } + + txq = eth_dev->data->tx_queues[i]; + if (txq) + txq->pkt_len_errors = 0; + } + + memset(stats, 0, sizeof(struct hns3_tqp_stats)); + + return 0; +} + +static void +hns3_mac_stats_reset(__rte_unused struct rte_eth_dev *dev) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_hw *hw = &hns->hw; + struct hns3_mac_stats *mac_stats = &hw->mac_stats; + int ret; + + ret = hns3_query_update_mac_stats(dev); + if (ret) + hns3_err(hw, "Clear Mac stats fail : %d", ret); + + memset(mac_stats, 0, sizeof(struct hns3_mac_stats)); +} + +/* This function calculates the number of xstats based on the current config */ +static int +hns3_xstats_calc_num(struct rte_eth_dev *dev) +{ + struct hns3_adapter *hns = dev->data->dev_private; + + if (hns->is_vf) + return dev->data->nb_rx_queues * HNS3_NUM_RX_BD_ERROR_XSTATS + + dev->data->nb_tx_queues * HNS3_NUM_TX_ERROR_XSTATS + + HNS3_NUM_RESET_XSTATS; + else + return dev->data->nb_rx_queues * HNS3_NUM_RX_BD_ERROR_XSTATS + + dev->data->nb_tx_queues * HNS3_NUM_TX_ERROR_XSTATS + + HNS3_FIX_NUM_STATS; +} + +/* + * Retrieve extended(tqp | Mac) statistics of an Ethernet device. + * @param dev + * Pointer to Ethernet device. + * @praram xstats + * A pointer to a table of structure of type *rte_eth_xstat* + * to be filled with device statistics ids and values. + * This parameter can be set to NULL if n is 0. + * @param n + * The size of the xstats array (number of elements). + * @return + * 0 on fail, count(The size of the statistics elements) on success. + */ +int +hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, + unsigned int n) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_pf *pf = &hns->pf; + struct hns3_hw *hw = &hns->hw; + struct hns3_mac_stats *mac_stats = &hw->mac_stats; + struct hns3_reset_stats *reset_stats = &hw->reset.stats; + struct hns3_rx_queue *rxq; + struct hns3_tx_queue *txq; + uint16_t i, j; + char *addr; + int count; + int ret; + + if (xstats == NULL) + return 0; + + count = hns3_xstats_calc_num(dev); + if ((int)n < count) + return count; + + count = 0; + + if (!hns->is_vf) { + /* Update Mac stats */ + ret = hns3_query_update_mac_stats(dev); + if (ret) { + hns3_err(hw, "Update Mac stats fail : %d", ret); + return 0; + } + + /* Get MAC stats from hw->hw_xstats.mac_stats struct */ + for (i = 0; i < HNS3_NUM_MAC_STATS; i++) { + addr = (char *)mac_stats + hns3_mac_strings[i].offset; + xstats[count].value = *(uint64_t *)addr; + xstats[count].id = count; + count++; + } + + for (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) { + addr = (char *)&pf->abn_int_stats + + hns3_error_int_stats_strings[i].offset; + xstats[count].value = *(uint64_t *)addr; + xstats[count].id = count; + count++; + } + } + + /* Get the reset stat */ + for (i = 0; i < HNS3_NUM_RESET_XSTATS; i++) { + addr = (char *)reset_stats + hns3_reset_stats_strings[i].offset; + xstats[count].value = *(uint64_t *)addr; + xstats[count].id = count; + count++; + } + + /* Get the Rx BD errors stats */ + for (j = 0; j != dev->data->nb_rx_queues; ++j) { + for (i = 0; i < HNS3_NUM_RX_BD_ERROR_XSTATS; i++) { + rxq = dev->data->rx_queues[j]; + addr = (char *)rxq + hns3_rx_bd_error_strings[i].offset; + xstats[count].value = *(uint64_t *)addr; + xstats[count].id = count; + count++; + } + } + + /* Get the Tx errors stats */ + for (j = 0; j != dev->data->nb_tx_queues; ++j) { + for (i = 0; i < HNS3_NUM_TX_ERROR_XSTATS; i++) { + txq = dev->data->tx_queues[j]; + addr = (char *)txq + hns3_tx_error_strings[i].offset; + xstats[count].value = *(uint64_t *)addr; + xstats[count].id = count; + count++; + } + } + return count; +} + +/* + * Retrieve names of extended statistics of an Ethernet device. + * + * There is an assumption that 'xstat_names' and 'xstats' arrays are matched + * by array index: + * xstats_names[i].name => xstats[i].value + * + * And the array index is same with id field of 'struct rte_eth_xstat': + * xstats[i].id == i + * + * This assumption makes key-value pair matching less flexible but simpler. + * + * @param dev + * Pointer to Ethernet device. + * @param xstats_names + * An rte_eth_xstat_name array of at least *size* elements to + * be filled. If set to NULL, the function returns the required number + * of elements. + * @param size + * The size of the xstats_names array (number of elements). + * @return + * - A positive value lower or equal to size: success. The return value + * is the number of entries filled in the stats table. + */ +int +hns3_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int size) +{ + struct hns3_adapter *hns = dev->data->dev_private; + int cnt_stats = hns3_xstats_calc_num(dev); + uint32_t count = 0; + uint16_t i, j; + + if (xstats_names == NULL) + return cnt_stats; + + /* Note: size limited checked in rte_eth_xstats_get_names() */ + if (!hns->is_vf) { + /* Get MAC name from hw->hw_xstats.mac_stats struct */ + for (i = 0; i < HNS3_NUM_MAC_STATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "%s", hns3_mac_strings[i].name); + count++; + } + + for (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "%s", hns3_error_int_stats_strings[i].name); + count++; + } + } + for (i = 0; i < HNS3_NUM_RESET_XSTATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "%s", hns3_reset_stats_strings[i].name); + count++; + } + + for (j = 0; j < dev->data->nb_rx_queues; j++) { + for (i = 0; i < HNS3_NUM_RX_BD_ERROR_XSTATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "rx_q%u%s", j, + hns3_rx_bd_error_strings[i].name); + count++; + } + } + for (j = 0; j < dev->data->nb_tx_queues; j++) { + for (i = 0; i < HNS3_NUM_TX_ERROR_XSTATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "tx_q%u%s", j, hns3_tx_error_strings[i].name); + count++; + } + } + + return count; +} + +/* + * Retrieve extended statistics of an Ethernet device. + * + * @param dev + * Pointer to Ethernet device. + * @param ids + * A pointer to an ids array passed by application. This tells which + * statistics values function should retrieve. This parameter + * can be set to NULL if size is 0. In this case function will retrieve + * all avalible statistics. + * @param values + * A pointer to a table to be filled with device statistics values. + * @param size + * The size of the ids array (number of elements). + * @return + * - A positive value lower or equal to size: success. The return value + * is the number of entries filled in the stats table. + * - A positive value higher than size: error, the given statistics table + * is too small. The return value corresponds to the size that should + * be given to succeed. The entries in the table are not valid and + * shall not be used by the caller. + * - 0 on no ids. + */ +int +hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, + uint64_t *values, uint32_t size) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_pf *pf = &hns->pf; + struct hns3_hw *hw = &hns->hw; + struct hns3_mac_stats *mac_stats = &hw->mac_stats; + struct hns3_reset_stats *reset_stats = &hw->reset.stats; + struct hns3_rx_queue *rxq; + struct hns3_tx_queue *txq; + const uint32_t cnt_stats = hns3_xstats_calc_num(dev); + uint64_t *values_copy; + uint64_t len; + uint32_t count = 0; + uint16_t i, j; + char *addr; + int ret; + + if (ids == NULL || size < cnt_stats) + return cnt_stats; + + /* Update tqp stats by read register */ + ret = hns3_update_tqp_stats(hw); + if (ret) { + hns3_err(hw, "Update tqp stats fail : %d", ret); + return ret; + } + + len = cnt_stats * HNS3_VALUES_BYTES; + values_copy = rte_zmalloc("hns3_xstats_values", len, 0); + if (values_copy == NULL) { + hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed " + "to store statistics values", len); + return -ENOMEM; + } + + if (!hns->is_vf) { + /* Get MAC name from hw->hw_xstats.mac_stats */ + for (i = 0; i < HNS3_NUM_MAC_STATS; i++) { + addr = (char *)mac_stats + hns3_mac_strings[i].offset; + values_copy[count] = *(uint64_t *)addr; + count++; + } + + for (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) { + addr = (char *)&pf->abn_int_stats + + hns3_error_int_stats_strings[i].offset; + values_copy[count] = *(uint64_t *)addr; + count++; + } + } + + for (i = 0; i < HNS3_NUM_RESET_XSTATS; i++) { + addr = (char *)reset_stats + + hns3_reset_stats_strings[i].offset; + values_copy[count] = *(uint64_t *)addr; + count++; + } + + for (j = 0; j != dev->data->nb_rx_queues; ++j) { + for (i = 0; i < HNS3_NUM_RX_BD_ERROR_XSTATS; i++) { + rxq = dev->data->rx_queues[j]; + addr = (char *)rxq + hns3_rx_bd_error_strings[i].offset; + values_copy[count] = *(uint64_t *)addr; + count++; + } + } + + for (j = 0; j != dev->data->nb_tx_queues; ++j) { + for (i = 0; i < HNS3_NUM_TX_ERROR_XSTATS; i++) { + txq = dev->data->tx_queues[j]; + addr = (char *)txq + hns3_tx_error_strings[i].offset; + values_copy[count] = *(uint64_t *)addr; + count++; + } + } + + for (i = 0; i < size; i++) { + if (ids[i] >= cnt_stats) { + hns3_err(hw, "ids[%d] (%" PRIx64 ") is invalid, " + "should < %u", i, ids[i], cnt_stats); + rte_free(values_copy); + return -EINVAL; + } + memcpy(&values[i], &values_copy[ids[i]], sizeof(values[i])); + } + + rte_free(values_copy); + return size; +} + +/* + * Retrieve names of extended statistics of an Ethernet device. + * + * @param dev + * Pointer to Ethernet device. + * @param xstats_names + * An rte_eth_xstat_name array of at least *size* elements to + * be filled. If set to NULL, the function returns the required number + * of elements. + * @param ids + * IDs array given by app to retrieve specific statistics + * @param size + * The size of the xstats_names array (number of elements). + * @return + * - A positive value lower or equal to size: success. The return value + * is the number of entries filled in the stats table. + * - A positive value higher than size: error, the given statistics table + * is too small. The return value corresponds to the size that should + * be given to succeed. The entries in the table are not valid and + * shall not be used by the caller. + */ +int +hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, uint32_t size) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct rte_eth_xstat_name *xstats_names_copy; + struct hns3_hw *hw = &hns->hw; + const uint32_t cnt_stats = hns3_xstats_calc_num(dev); + uint16_t count_name = 0; + uint16_t i, j; + uint64_t len; + + if (ids == NULL || xstats_names == NULL) + return cnt_stats; + + len = cnt_stats * sizeof(struct rte_eth_xstat_name); + xstats_names_copy = rte_zmalloc("hns3_xstats_names", len, 0); + if (xstats_names_copy == NULL) { + hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed " + "to store statistics names", len); + return -ENOMEM; + } + + if (!hns->is_vf) { + for (i = 0; i < HNS3_NUM_MAC_STATS; i++) { + snprintf(xstats_names_copy[count_name].name, + sizeof(xstats_names_copy[count_name].name), + "%s", hns3_mac_strings[i].name); + count_name++; + } + for (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) { + snprintf(xstats_names_copy[count_name].name, + sizeof(xstats_names_copy[count_name].name), + "%s", hns3_error_int_stats_strings[i].name); + count_name++; + } + } + for (i = 0; i < HNS3_NUM_RESET_XSTATS; i++) { + snprintf(xstats_names_copy[count_name].name, + sizeof(xstats_names_copy[count_name].name), + "%s", hns3_reset_stats_strings[i].name); + count_name++; + } + for (j = 0; j != dev->data->nb_rx_queues; ++j) { + for (i = 0; i < HNS3_NUM_RX_BD_ERROR_XSTATS; i++) { + snprintf(xstats_names_copy[count_name].name, + sizeof(xstats_names_copy[count_name].name), + "rx_q%u%s", j, + hns3_rx_bd_error_strings[i].name); + count_name++; + } + } + for (j = 0; j != dev->data->nb_rx_queues; ++j) { + for (i = 0; i < HNS3_NUM_TX_ERROR_XSTATS; i++) { + snprintf(xstats_names_copy[count_name].name, + sizeof(xstats_names_copy[count_name].name), + "tx_q%u%s", j, hns3_tx_error_strings[i].name); + count_name++; + } + } + + for (i = 0; i < size; i++) { + if (ids[i] >= cnt_stats) { + hns3_err(hw, "ids[%d] (%" PRIx64 ") is invalid, " + "should < %u", i, ids[i], cnt_stats); + rte_free(xstats_names_copy); + return -EINVAL; + } + snprintf(xstats_names[i].name, sizeof(xstats_names[i].name), + "%s", xstats_names_copy[ids[i]].name); + } + + rte_free(xstats_names_copy); + return size; +} + +int +hns3_dev_xstats_reset(struct rte_eth_dev *dev) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_pf *pf = &hns->pf; + + /* Clear tqp stats */ + (void)hns3_stats_reset(dev); + /* Clear reset stats */ + memset(&hns->hw.reset.stats, 0, sizeof(struct hns3_reset_stats)); + + if (hns->is_vf) + return 0; + + /* HW registers are cleared on read */ + hns3_mac_stats_reset(dev); + /* Clear error stats */ + memset(&pf->abn_int_stats, 0, sizeof(struct hns3_err_msix_intr_stats)); + + return 0; +} diff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h new file mode 100644 index 0000000..365bae0 --- /dev/null +++ b/drivers/net/hns3/hns3_stats.h @@ -0,0 +1,152 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018-2019 Hisilicon Limited. + */ + +#ifndef _HNS3_STATS_H_ +#define _HNS3_STATS_H_ + +/* stats macro */ +#define HNS3_MAC_CMD_NUM 21 +#define HNS3_RD_FIRST_STATS_NUM 2 +#define HNS3_RD_OTHER_STATS_NUM 4 +#define HNS3_VALUES_BYTES 8 + +/* TQP stats */ +struct hns3_tqp_stats { + uint64_t rcb_tx_ring_pktnum_rcd; /* Total num of transmitted packets */ + uint64_t rcb_rx_ring_pktnum_rcd; /* Total num of received packets */ + uint64_t rcb_tx_ring_pktnum[HNS3_MAX_TQP_NUM_PER_FUNC]; + uint64_t rcb_rx_ring_pktnum[HNS3_MAX_TQP_NUM_PER_FUNC]; +}; + +/* mac stats, Statistics counters collected by the MAC, opcode id: 0x0032 */ +struct hns3_mac_stats { + uint64_t mac_tx_mac_pause_num; + uint64_t mac_rx_mac_pause_num; + uint64_t mac_tx_pfc_pri0_pkt_num; + uint64_t mac_tx_pfc_pri1_pkt_num; + uint64_t mac_tx_pfc_pri2_pkt_num; + uint64_t mac_tx_pfc_pri3_pkt_num; + uint64_t mac_tx_pfc_pri4_pkt_num; + uint64_t mac_tx_pfc_pri5_pkt_num; + uint64_t mac_tx_pfc_pri6_pkt_num; + uint64_t mac_tx_pfc_pri7_pkt_num; + uint64_t mac_rx_pfc_pri0_pkt_num; + uint64_t mac_rx_pfc_pri1_pkt_num; + uint64_t mac_rx_pfc_pri2_pkt_num; + uint64_t mac_rx_pfc_pri3_pkt_num; + uint64_t mac_rx_pfc_pri4_pkt_num; + uint64_t mac_rx_pfc_pri5_pkt_num; + uint64_t mac_rx_pfc_pri6_pkt_num; + uint64_t mac_rx_pfc_pri7_pkt_num; + uint64_t mac_tx_total_pkt_num; + uint64_t mac_tx_total_oct_num; + uint64_t mac_tx_good_pkt_num; + uint64_t mac_tx_bad_pkt_num; + uint64_t mac_tx_good_oct_num; + uint64_t mac_tx_bad_oct_num; + uint64_t mac_tx_uni_pkt_num; + uint64_t mac_tx_multi_pkt_num; + uint64_t mac_tx_broad_pkt_num; + uint64_t mac_tx_undersize_pkt_num; + uint64_t mac_tx_oversize_pkt_num; + uint64_t mac_tx_64_oct_pkt_num; + uint64_t mac_tx_65_127_oct_pkt_num; + uint64_t mac_tx_128_255_oct_pkt_num; + uint64_t mac_tx_256_511_oct_pkt_num; + uint64_t mac_tx_512_1023_oct_pkt_num; + uint64_t mac_tx_1024_1518_oct_pkt_num; + uint64_t mac_tx_1519_2047_oct_pkt_num; + uint64_t mac_tx_2048_4095_oct_pkt_num; + uint64_t mac_tx_4096_8191_oct_pkt_num; + uint64_t rsv0; + uint64_t mac_tx_8192_9216_oct_pkt_num; + uint64_t mac_tx_9217_12287_oct_pkt_num; + uint64_t mac_tx_12288_16383_oct_pkt_num; + uint64_t mac_tx_1519_max_good_oct_pkt_num; + uint64_t mac_tx_1519_max_bad_oct_pkt_num; + + uint64_t mac_rx_total_pkt_num; + uint64_t mac_rx_total_oct_num; + uint64_t mac_rx_good_pkt_num; + uint64_t mac_rx_bad_pkt_num; + uint64_t mac_rx_good_oct_num; + uint64_t mac_rx_bad_oct_num; + uint64_t mac_rx_uni_pkt_num; + uint64_t mac_rx_multi_pkt_num; + uint64_t mac_rx_broad_pkt_num; + uint64_t mac_rx_undersize_pkt_num; + uint64_t mac_rx_oversize_pkt_num; + uint64_t mac_rx_64_oct_pkt_num; + uint64_t mac_rx_65_127_oct_pkt_num; + uint64_t mac_rx_128_255_oct_pkt_num; + uint64_t mac_rx_256_511_oct_pkt_num; + uint64_t mac_rx_512_1023_oct_pkt_num; + uint64_t mac_rx_1024_1518_oct_pkt_num; + uint64_t mac_rx_1519_2047_oct_pkt_num; + uint64_t mac_rx_2048_4095_oct_pkt_num; + uint64_t mac_rx_4096_8191_oct_pkt_num; + uint64_t rsv1; + uint64_t mac_rx_8192_9216_oct_pkt_num; + uint64_t mac_rx_9217_12287_oct_pkt_num; + uint64_t mac_rx_12288_16383_oct_pkt_num; + uint64_t mac_rx_1519_max_good_oct_pkt_num; + uint64_t mac_rx_1519_max_bad_oct_pkt_num; + + uint64_t mac_tx_fragment_pkt_num; + uint64_t mac_tx_undermin_pkt_num; + uint64_t mac_tx_jabber_pkt_num; + uint64_t mac_tx_err_all_pkt_num; + uint64_t mac_tx_from_app_good_pkt_num; + uint64_t mac_tx_from_app_bad_pkt_num; + uint64_t mac_rx_fragment_pkt_num; + uint64_t mac_rx_undermin_pkt_num; + uint64_t mac_rx_jabber_pkt_num; + uint64_t mac_rx_fcs_err_pkt_num; + uint64_t mac_rx_send_app_good_pkt_num; + uint64_t mac_rx_send_app_bad_pkt_num; + uint64_t mac_tx_pfc_pause_pkt_num; + uint64_t mac_rx_pfc_pause_pkt_num; + uint64_t mac_tx_ctrl_pkt_num; + uint64_t mac_rx_ctrl_pkt_num; +}; + +/* store statistics names and its offset in stats structure */ +struct hns3_xstats_name_offset { + char name[RTE_ETH_XSTATS_NAME_SIZE]; + uint32_t offset; +}; + +#define HNS3_MAC_STATS_OFFSET(f) \ + (offsetof(struct hns3_mac_stats, f)) + +#define HNS3_ERR_INT_STATS_FIELD_OFFSET(f) \ + (offsetof(struct hns3_err_msix_intr_stats, f)) + +struct hns3_reset_stats; +#define HNS3_RESET_STATS_FIELD_OFFSET(f) \ + (offsetof(struct hns3_reset_stats, f)) + +#define HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(f) \ + (offsetof(struct hns3_rx_queue, f)) + +#define HNS3_TX_ERROR_STATS_FIELD_OFFSET(f) \ + (offsetof(struct hns3_tx_queue, f)) + +int hns3_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats); +int hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, + unsigned int n); +int hns3_dev_xstats_reset(struct rte_eth_dev *dev); +int hns3_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + __rte_unused unsigned int size); +int hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, + __rte_unused const uint64_t *ids, + __rte_unused uint64_t *values, + uint32_t size); +int hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev, + struct rte_eth_xstat_name *xstats_names, + const uint64_t *ids, + uint32_t size); +int hns3_stats_reset(struct rte_eth_dev *dev); +#endif /* _HNS3_STATS_H_ */ diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build index 519af97..87e1a0c 100644 --- a/drivers/net/hns3/meson.build +++ b/drivers/net/hns3/meson.build @@ -24,5 +24,6 @@ sources = files('hns3_cmd.c', 'hns3_regs.c', 'hns3_rss.c', 'hns3_rxtx.c', + 'hns3_stats.c', ) deps += ['hash'] -- 2.7.4