Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87655/?format=api
{ "id": 87655, "url": "http://patches.dpdk.org/api/patches/87655/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1612338382-3253-5-git-send-email-oulijun@huawei.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1612338382-3253-5-git-send-email-oulijun@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1612338382-3253-5-git-send-email-oulijun@huawei.com", "date": "2021-02-03T07:46:09", "name": "[04/17] net/hns3: add enhance stats function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3b3d442e1505dcbfc869ad314d3d046eb866241d", "submitter": { "id": 1675, "url": "http://patches.dpdk.org/api/people/1675/?format=api", "name": "Lijun Ou", "email": "oulijun@huawei.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1612338382-3253-5-git-send-email-oulijun@huawei.com/mbox/", "series": [ { "id": 15115, "url": "http://patches.dpdk.org/api/series/15115/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15115", "date": "2021-02-03T07:46:05", "name": "bugfixes and small functionality for hns3", "version": 1, "mbox": "http://patches.dpdk.org/series/15115/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/87655/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/87655/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 107C6A0A0E;\n\tWed, 3 Feb 2021 08:47:20 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9AC54240460;\n\tWed, 3 Feb 2021 08:46:57 +0100 (CET)", "from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32])\n by mails.dpdk.org (Postfix) with ESMTP id 03C33240444\n for <dev@dpdk.org>; Wed, 3 Feb 2021 08:46:52 +0100 (CET)", "from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60])\n by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4DVtyf6DrYzjH0G;\n Wed, 3 Feb 2021 15:45:46 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id\n 14.3.498.0; Wed, 3 Feb 2021 15:46:48 +0800" ], "From": "Lijun Ou <oulijun@huawei.com>", "To": "<ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>, <linuxarm@openeuler.org>", "Date": "Wed, 3 Feb 2021 15:46:09 +0800", "Message-ID": "<1612338382-3253-5-git-send-email-oulijun@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1612338382-3253-1-git-send-email-oulijun@huawei.com>", "References": "<1612338382-3253-1-git-send-email-oulijun@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 04/17] net/hns3: add enhance stats function", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: \"Min Hu (Connor)\" <humin29@huawei.com>\n\nIn current HNS3 PMD, Rx/Tx bytes and imissed from\npacket stats are not implemented.\n\nThis patch implemented Rx/Tx bytes using soft counters.\nRx/Tx bytes stats will be enabled if the macro\nRTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS is defined. Also,\nRx imissed stats was in implemented in this patch.\n\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\nSigned-off-by: Lijun Ou <oulijun@huawei.com>\n---\n drivers/net/hns3/hns3_cmd.h | 7 ++\n drivers/net/hns3/hns3_ethdev.c | 7 ++\n drivers/net/hns3/hns3_ethdev.h | 1 +\n drivers/net/hns3/hns3_rxtx.c | 24 ++++++\n drivers/net/hns3/hns3_rxtx_vec_neon.h | 15 ++++\n drivers/net/hns3/hns3_rxtx_vec_sve.c | 11 +++\n drivers/net/hns3/hns3_stats.c | 137 +++++++++++++++++++++++++++++++---\n drivers/net/hns3/hns3_stats.h | 8 ++\n 8 files changed, 201 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h\nindex e473a30..6b1ce22 100644\n--- a/drivers/net/hns3/hns3_cmd.h\n+++ b/drivers/net/hns3/hns3_cmd.h\n@@ -889,6 +889,13 @@ struct hns3_dev_specs_0_cmd {\n \tuint32_t max_tm_rate;\n };\n \n+struct hns3_query_rpu_cmd {\n+\tuint32_t tc_queue_num;\n+\tuint32_t rsv1[2];\n+\tuint32_t rpu_rx_pkt_drop_cnt;\n+\tuint32_t rsv2[2];\n+};\n+\n #define HNS3_MAX_TQP_NUM_HIP08_PF\t64\n #define HNS3_DEFAULT_TX_BUF\t\t0x4000 /* 16k bytes */\n #define HNS3_TOTAL_PKT_BUF\t\t0x108000 /* 1.03125M bytes */\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex f85149d..bd998f6 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -4679,6 +4679,13 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)\n \t\tgoto err_cmd_init;\n \t}\n \n+\t/* Hardware statistics of imissed registers cleared. */\n+\tret = hns3_update_imissed_stats(hw, true);\n+\tif (ret) {\n+\t\thns3_err(hw, \"clear imissed stats failed, ret = %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n \thns3_config_all_msix_error(hw, true);\n \n \tret = rte_intr_callback_register(&pci_dev->intr_handle,\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex e72f3e1..520af20 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -434,6 +434,7 @@ struct hns3_hw {\n \tstruct hns3_tqp_stats tqp_stats;\n \t/* Include Mac stats | Rx stats | Tx stats */\n \tstruct hns3_mac_stats mac_stats;\n+\tstruct hns3_rx_missed_stats imissed_stats;\n \tuint32_t fw_version;\n \n \tuint16_t num_msi;\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 5e79177..a8bd2cc 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -2181,6 +2181,10 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\t\t\t cksum_err);\n \t\thns3_rxd_to_vlan_tci(rxq, rxm, l234_info, &rxd);\n \n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += rxm->pkt_len;\n+#endif\n \t\trx_pkts[nb_rx++] = rxm;\n \t\tcontinue;\n pkt_err:\n@@ -2401,6 +2405,10 @@ hns3_recv_scattered_pkts(void *rx_queue,\n \t\t\t\t\t cksum_err);\n \t\thns3_rxd_to_vlan_tci(rxq, first_seg, l234_info, &rxd);\n \n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += first_seg->pkt_len;\n+#endif\n \t\trx_pkts[nb_rx++] = first_seg;\n \t\tfirst_seg = NULL;\n \t\tcontinue;\n@@ -3516,6 +3524,13 @@ hns3_tx_fill_hw_ring(struct hns3_tx_queue *txq,\n \tfor (i = 0; i < mainpart; i += PER_LOOP_NUM) {\n \t\thns3_tx_backup_4mbuf(tx_entry + i, pkts + i);\n \t\thns3_tx_setup_4bd(txdp + i, pkts + i);\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\tuint32_t j;\n+\t\tfor (j = 0; j < PER_LOOP_NUM; j++)\n+\t\t\ttxq->basic_stats.bytes += pkts[i + j]->pkt_len;\n+#endif\n \t}\n \tif (unlikely(leftover > 0)) {\n \t\tfor (i = 0; i < leftover; i++) {\n@@ -3523,6 +3538,11 @@ hns3_tx_fill_hw_ring(struct hns3_tx_queue *txq,\n \t\t\t\t\t pkts + mainpart + i);\n \t\t\thns3_tx_setup_1bd(txdp + mainpart + i,\n \t\t\t\t\t pkts + mainpart + i);\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t\t/* Increment bytes counter */\n+\t\t\ttxq->basic_stats.bytes += pkts[mainpart + i]->pkt_len;\n+#endif\n \t\t}\n \t}\n }\n@@ -3661,6 +3681,10 @@ hns3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\tdesc->tx.tp_fe_sc_vld_ra_ri |=\n \t\t\t\t rte_cpu_to_le_16(BIT(HNS3_TXD_FE_B));\n \n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\ttxq->basic_stats.bytes += tx_pkt->pkt_len;\n+#endif\n \t\tnb_hold += i;\n \t\ttxq->next_to_use = tx_next_use;\n \t\ttxq->tx_bd_ready -= i;\ndiff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h\nindex a693b4b..54d358d 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h\n+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h\n@@ -61,6 +61,11 @@ hns3_xmit_fixed_burst_vec(void *__restrict tx_queue,\n \t\tfor (i = 0; i < n; i++, tx_pkts++, tx_desc++) {\n \t\t\thns3_vec_tx(tx_desc, *tx_pkts);\n \t\t\ttx_entry[i].mbuf = *tx_pkts;\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t\t/* Increment bytes counter */\n+\t\t\ttxq->basic_stats.bytes += (*tx_pkts)->pkt_len;\n+#endif\n \t\t}\n \n \t\tnb_commit -= n;\n@@ -72,6 +77,11 @@ hns3_xmit_fixed_burst_vec(void *__restrict tx_queue,\n \tfor (i = 0; i < nb_commit; i++, tx_pkts++, tx_desc++) {\n \t\thns3_vec_tx(tx_desc, *tx_pkts);\n \t\ttx_entry[i].mbuf = *tx_pkts;\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\ttxq->basic_stats.bytes += (*tx_pkts)->pkt_len;\n+#endif\n \t}\n \n \tnext_to_use += nb_commit;\n@@ -116,6 +126,11 @@ hns3_desc_parse_field(struct hns3_rx_queue *rxq,\n \t\tif (likely(bd_base_info & BIT(HNS3_RXD_L3L4P_B)))\n \t\t\thns3_rx_set_cksum_flag(pkt, pkt->packet_type,\n \t\t\t\t\t cksum_err);\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += pkt->pkt_len;\n+#endif\n \t}\n \n \treturn retcode;\ndiff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c\nindex b02bae7..8b9172a 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c\n+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c\n@@ -58,6 +58,11 @@ hns3_desc_parse_field_sve(struct hns3_rx_queue *rxq,\n \t\tif (likely(key->bd_base_info[i] & BIT(HNS3_RXD_L3L4P_B)))\n \t\t\thns3_rx_set_cksum_flag(rx_pkts[i],\n \t\t\t\t\trx_pkts[i]->packet_type, cksum_err);\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += rx_pkts[i]->pkt_len;\n+#endif\n \t}\n \n \treturn retcode;\n@@ -408,6 +413,12 @@ hns3_tx_fill_hw_ring_sve(struct hns3_tx_queue *txq,\n \t\tsvst1_scatter_u64offset_u64(pg, (uint64_t *)&txdp->tx.paylen,\n \t\t\t\t\t offsets, svdup_n_u64(valid_bit));\n \n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter */\n+\t\tuint32_t idx;\n+\t\tfor (idx = 0; idx < svcntd(); idx++)\n+\t\t\ttxq->basic_stats.bytes += pkts[idx]->pkt_len;\n+#endif\n \t\t/* update index for next loop */\n \t\ti += svcntd();\n \t\tpkts += svcntd();\ndiff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c\nindex 3ba09e2..e58ebea 100644\n--- a/drivers/net/hns3/hns3_stats.c\n+++ b/drivers/net/hns3/hns3_stats.c\n@@ -324,6 +324,12 @@ static const struct hns3_xstats_name_offset hns3_tx_queue_strings[] = {\n \t{\"TX_QUEUE_FBD\", HNS3_RING_TX_FBDNUM_REG}\n };\n \n+/* The statistic of imissed packet */\n+static const struct hns3_xstats_name_offset hns3_imissed_stats_strings[] = {\n+\t{\"RPU_DROP_CNT\",\n+\t\tHNS3_IMISSED_STATS_FIELD_OFFSET(rpu_rx_drop_cnt)},\n+};\n+\n #define HNS3_NUM_MAC_STATS (sizeof(hns3_mac_strings) / \\\n \tsizeof(hns3_mac_strings[0]))\n \n@@ -354,10 +360,14 @@ static const struct hns3_xstats_name_offset hns3_tx_queue_strings[] = {\n #define HNS3_NUM_TXQ_BASIC_STATS (sizeof(hns3_txq_basic_stats_strings) / \\\n \tsizeof(hns3_txq_basic_stats_strings[0]))\n \n+#define HNS3_NUM_IMISSED_XSTATS (sizeof(hns3_imissed_stats_strings) / \\\n+\tsizeof(hns3_imissed_stats_strings[0]))\n+\n #define HNS3_FIX_NUM_STATS (HNS3_NUM_MAC_STATS + HNS3_NUM_ERROR_INT_XSTATS + \\\n-\t\t\t HNS3_NUM_RESET_XSTATS)\n+\t\t\t HNS3_NUM_RESET_XSTATS + HNS3_NUM_IMISSED_XSTATS)\n \n static void hns3_tqp_stats_clear(struct hns3_hw *hw);\n+static void hns3_tqp_basic_stats_clear(struct rte_eth_dev *dev);\n \n /*\n * Query all the MAC statistics data of Network ICL command ,opcode id: 0x0034.\n@@ -514,6 +524,52 @@ hns3_update_tqp_stats(struct hns3_hw *hw)\n \treturn 0;\n }\n \n+static int\n+hns3_update_rpu_drop_stats(struct hns3_hw *hw)\n+{\n+\tstruct hns3_rx_missed_stats *stats = &hw->imissed_stats;\n+\tstruct hns3_query_rpu_cmd *req;\n+\tstruct hns3_cmd_desc desc;\n+\tuint64_t cnt;\n+\tuint32_t tc_num;\n+\tint ret;\n+\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_DFX_RPU_REG_0, true);\n+\treq = (struct hns3_query_rpu_cmd *)desc.data;\n+\n+\t/*\n+\t * tc_num is 0, means rpu stats of all TC channels will be\n+\t * get from firmware\n+\t */\n+\ttc_num = 0;\n+\treq->tc_queue_num = rte_cpu_to_le_32(tc_num);\n+\tret = hns3_cmd_send(hw, &desc, 1);\n+\tif (ret) {\n+\t\thns3_err(hw, \"failed to query RPU stats: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\tcnt = rte_le_to_cpu_32(req->rpu_rx_pkt_drop_cnt);\n+\tstats->rpu_rx_drop_cnt += cnt;\n+\n+\treturn 0;\n+}\n+\n+int\n+hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear)\n+{\n+\tint ret;\n+\n+\tret = hns3_update_rpu_drop_stats(hw);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (is_clear)\n+\t\tmemset(&hw->imissed_stats, 0, sizeof(hw->imissed_stats));\n+\n+\treturn 0;\n+}\n+\n /*\n * Query tqp tx queue statistics ,opcode id: 0x0B03.\n * Query tqp rx queue statistics ,opcode id: 0x0B13.\n@@ -530,6 +586,7 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)\n {\n \tstruct hns3_adapter *hns = eth_dev->data->dev_private;\n \tstruct hns3_hw *hw = &hns->hw;\n+\tstruct hns3_rx_missed_stats *imissed_stats = &hw->imissed_stats;\n \tstruct hns3_tqp_stats *stats = &hw->tqp_stats;\n \tstruct hns3_rx_queue *rxq;\n \tuint64_t cnt;\n@@ -539,22 +596,48 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)\n \t/* Update tqp stats by read register */\n \tret = hns3_update_tqp_stats(hw);\n \tif (ret) {\n-\t\thns3_err(hw, \"Update tqp stats fail : %d\", ret);\n+\t\thns3_err(hw, \"update tqp stats fail : %d\", ret);\n \t\treturn ret;\n \t}\n \n-\t/* Get the error stats of received packets */\n+\tif (!hns->is_vf) {\n+\t\t/* Update imissed stats */\n+\t\tret = hns3_update_imissed_stats(hw, false);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"update imissed stats failed, ret = %d\",\n+\t\t\t\t ret);\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\trte_stats->imissed = imissed_stats->rpu_rx_drop_cnt;\n+\t}\n+\n+\t/* Get the error stats and bytes of received packets */\n \tfor (i = 0; i < eth_dev->data->nb_rx_queues; i++) {\n \t\trxq = eth_dev->data->rx_queues[i];\n \t\tif (rxq) {\n \t\t\tcnt = rxq->err_stats.l2_errors +\n \t\t\t\trxq->err_stats.pkt_len_errors;\n \t\t\trte_stats->ierrors += cnt;\n+\n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t\t\trte_stats->ibytes += rxq->basic_stats.bytes;\n+#endif\n \t\t}\n \t}\n \n+#ifdef RTE_LIBRTE_HNS3_PMD_SOFT_COUNTERS\n+\t/* Get the bytes of received packets */\n+\tstruct hns3_tx_queue *txq;\n+\tfor (i = 0; i < eth_dev->data->nb_tx_queues; i++) {\n+\t\ttxq = eth_dev->data->tx_queues[i];\n+\t\tif (txq)\n+\t\t\trte_stats->obytes += txq->basic_stats.bytes;\n+\t}\n+#endif\n+\n \trte_stats->oerrors = 0;\n-\trte_stats->ipackets = stats->rcb_rx_ring_pktnum_rcd -\n+\trte_stats->ipackets = stats->rcb_rx_ring_pktnum_rcd -\n \t\trte_stats->ierrors;\n \trte_stats->opackets = stats->rcb_tx_ring_pktnum_rcd -\n \t\trte_stats->oerrors;\n@@ -583,7 +666,7 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)\n \t\tdesc_reset.data[0] = rte_cpu_to_le_32((uint32_t)i);\n \t\tret = hns3_cmd_send(hw, &desc_reset, 1);\n \t\tif (ret) {\n-\t\t\thns3_err(hw, \"Failed to reset RX No.%u queue stat: %d\",\n+\t\t\thns3_err(hw, \"failed to reset RX No.%u queue stat: %d\",\n \t\t\t\t i, ret);\n \t\t\treturn ret;\n \t\t}\n@@ -593,12 +676,25 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)\n \t\tdesc_reset.data[0] = rte_cpu_to_le_32((uint32_t)i);\n \t\tret = hns3_cmd_send(hw, &desc_reset, 1);\n \t\tif (ret) {\n-\t\t\thns3_err(hw, \"Failed to reset TX No.%u queue stat: %d\",\n+\t\t\thns3_err(hw, \"failed to reset TX No.%u queue stat: %d\",\n \t\t\t\t i, ret);\n \t\t\treturn ret;\n \t\t}\n \t}\n \n+\tif (!hns->is_vf) {\n+\t\t/*\n+\t\t * Note: Reading hardware statistics of imissed registers will\n+\t\t * clear them.\n+\t\t */\n+\t\tret = hns3_update_imissed_stats(hw, true);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"clear imissed stats failed, ret = %d\",\n+\t\t\t\t ret);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n \t/*\n \t * Clear soft stats of rx error packet which will be dropped\n \t * in driver.\n@@ -617,6 +713,7 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)\n \t * their source.\n \t */\n \thns3_tqp_stats_clear(hw);\n+\thns3_tqp_basic_stats_clear(eth_dev);\n \n \treturn 0;\n }\n@@ -794,7 +891,7 @@ hns3_rxq_basic_stats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\t\t\t\trxq->err_stats.pkt_len_errors;\n \t\trxq_stats->packets = stats->rcb_rx_ring_pktnum[i] -\n \t\t\trxq_stats->errors;\n-\t\trxq_stats->bytes = 0;\n+\n \t\tfor (j = 0; j < HNS3_NUM_RXQ_BASIC_STATS; j++) {\n \t\t\tval = (char *)rxq_stats +\n \t\t\t\thns3_rxq_basic_stats_strings[j].offset;\n@@ -823,7 +920,7 @@ hns3_txq_basic_stats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \n \t\ttxq_stats = &txq->basic_stats;\n \t\ttxq_stats->packets = stats->rcb_tx_ring_pktnum[i];\n-\t\ttxq_stats->bytes = 0;\n+\n \t\tfor (j = 0; j < HNS3_NUM_TXQ_BASIC_STATS; j++) {\n \t\t\tval = (char *)txq_stats +\n \t\t\t\thns3_txq_basic_stats_strings[j].offset;\n@@ -904,6 +1001,7 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \tstruct hns3_adapter *hns = dev->data->dev_private;\n \tstruct hns3_pf *pf = &hns->pf;\n \tstruct hns3_hw *hw = &hns->hw;\n+\tstruct hns3_rx_missed_stats *imissed_stats = &hw->imissed_stats;\n \tstruct hns3_mac_stats *mac_stats = &hw->mac_stats;\n \tstruct hns3_reset_stats *reset_stats = &hw->reset.stats;\n \tstruct hns3_rx_bd_errors_stats *rx_err_stats;\n@@ -942,6 +1040,21 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\t\tcount++;\n \t\t}\n \n+\t\tret = hns3_update_imissed_stats(hw, false);\n+\t\tif (ret) {\n+\t\t\thns3_err(hw, \"update imissed stats failed, ret = %d\",\n+\t\t\t\t ret);\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\tfor (i = 0; i < HNS3_NUM_IMISSED_XSTATS; i++) {\n+\t\t\taddr = (char *)imissed_stats +\n+\t\t\t\thns3_imissed_stats_strings[i].offset;\n+\t\t\txstats[count].value = *(uint64_t *)addr;\n+\t\t\txstats[count].id = count;\n+\t\t\tcount++;\n+\t\t}\n+\n \t\tfor (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) {\n \t\t\taddr = (char *)&pf->abn_int_stats +\n \t\t\t hns3_error_int_stats_strings[i].offset;\n@@ -1084,6 +1197,13 @@ hns3_dev_xstats_get_names(struct rte_eth_dev *dev,\n \t\t\tcount++;\n \t\t}\n \n+\t\tfor (i = 0; i < HNS3_NUM_IMISSED_XSTATS; i++) {\n+\t\t\tsnprintf(xstats_names[count].name,\n+\t\t\t\t sizeof(xstats_names[count].name),\n+\t\t\t\t \"%s\", hns3_imissed_stats_strings[i].name);\n+\t\t\tcount++;\n+\t\t}\n+\n \t\tfor (i = 0; i < HNS3_NUM_ERROR_INT_XSTATS; i++) {\n \t\t\tsnprintf(xstats_names[count].name,\n \t\t\t\t sizeof(xstats_names[count].name),\n@@ -1315,7 +1435,6 @@ hns3_dev_xstats_reset(struct rte_eth_dev *dev)\n \tif (ret)\n \t\treturn ret;\n \n-\thns3_tqp_basic_stats_clear(dev);\n \thns3_tqp_dfx_stats_clear(dev);\n \n \t/* Clear reset stats */\ndiff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h\nindex d213be5..01b4f36 100644\n--- a/drivers/net/hns3/hns3_stats.h\n+++ b/drivers/net/hns3/hns3_stats.h\n@@ -110,6 +110,10 @@ struct hns3_mac_stats {\n \tuint64_t mac_rx_ctrl_pkt_num;\n };\n \n+struct hns3_rx_missed_stats {\n+\tuint64_t rpu_rx_drop_cnt;\n+};\n+\n /* store statistics names and its offset in stats structure */\n struct hns3_xstats_name_offset {\n \tchar name[RTE_ETH_XSTATS_NAME_SIZE];\n@@ -141,6 +145,9 @@ struct hns3_reset_stats;\n #define HNS3_TXQ_BASIC_STATS_FIELD_OFFSET(f) \\\n \t(offsetof(struct hns3_tx_basic_stats, f))\n \n+#define HNS3_IMISSED_STATS_FIELD_OFFSET(f) \\\n+\t(offsetof(struct hns3_rx_missed_stats, f))\n+\n int hns3_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats);\n int hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\t\tunsigned int n);\n@@ -160,5 +167,6 @@ int hns3_stats_reset(struct rte_eth_dev *dev);\n void hns3_error_int_stats_add(struct hns3_adapter *hns, const char *err);\n int hns3_tqp_stats_init(struct hns3_hw *hw);\n void hns3_tqp_stats_uninit(struct hns3_hw *hw);\n+int hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear);\n \n #endif /* _HNS3_STATS_H_ */\n", "prefixes": [ "04/17" ] }