Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/88457/?format=api
{ "id": 88457, "url": "https://patches.dpdk.org/api/patches/88457/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1614843894-43845-5-git-send-email-oulijun@huawei.com/", "project": { "id": 1, "url": "https://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": "<1614843894-43845-5-git-send-email-oulijun@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1614843894-43845-5-git-send-email-oulijun@huawei.com", "date": "2021-03-04T07:44:44", "name": "[V3,04/14] net/hns3: add Rx and Tx bytes stats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "569024540c5c16d0bf62af7fe248c8e0cdf973d3", "submitter": { "id": 1675, "url": "https://patches.dpdk.org/api/people/1675/?format=api", "name": "Lijun Ou", "email": "oulijun@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1614843894-43845-5-git-send-email-oulijun@huawei.com/mbox/", "series": [ { "id": 15486, "url": "https://patches.dpdk.org/api/series/15486/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=15486", "date": "2021-03-04T07:44:40", "name": "Features and bugfixes for hns3", "version": 3, "mbox": "https://patches.dpdk.org/series/15486/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/88457/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/88457/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 A924EA0561;\n\tThu, 4 Mar 2021 08:46:03 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id BF68122A346;\n\tThu, 4 Mar 2021 08:44:33 +0100 (CET)", "from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190])\n by mails.dpdk.org (Postfix) with ESMTP id 7366522A2F6\n for <dev@dpdk.org>; Thu, 4 Mar 2021 08:44:26 +0100 (CET)", "from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.60])\n by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DrjW16hLhzlSYD;\n Thu, 4 Mar 2021 15:42:05 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id\n 14.3.498.0; Thu, 4 Mar 2021 15:44:10 +0800" ], "From": "Lijun Ou <oulijun@huawei.com>", "To": "<ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>, <linuxarm@openeuler.org>", "Date": "Thu, 4 Mar 2021 15:44:44 +0800", "Message-ID": "<1614843894-43845-5-git-send-email-oulijun@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1614843894-43845-1-git-send-email-oulijun@huawei.com>", "References": "<1614693534-27620-1-git-send-email-oulijun@huawei.com>\n <1614843894-43845-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 V3 04/14] net/hns3: add Rx and Tx bytes stats", "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 from packet stats are not\nimplemented.\n\nThis patch implemented Rx/Tx bytes using soft counters.\n\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\nSigned-off-by: Lijun Ou <oulijun@huawei.com>\n---\nV2->V3:\n- remote the macro RTE_LIBRTE_HNS3_PMD_SOFT_COUNTER\n- update the commit log\n---\n drivers/net/hns3/hns3_rxtx.c | 16 ++++++++++++++++\n drivers/net/hns3/hns3_rxtx_vec_neon.h | 9 +++++++++\n drivers/net/hns3/hns3_rxtx_vec_sve.c | 8 ++++++++\n drivers/net/hns3/hns3_stats.c | 18 ++++++++++++++----\n 4 files changed, 47 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 5e79177..2099006 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -2181,6 +2181,9 @@ 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+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += rxm->pkt_len;\n+\n \t\trx_pkts[nb_rx++] = rxm;\n \t\tcontinue;\n pkt_err:\n@@ -2401,6 +2404,9 @@ 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+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += first_seg->pkt_len;\n+\n \t\trx_pkts[nb_rx++] = first_seg;\n \t\tfirst_seg = NULL;\n \t\tcontinue;\n@@ -3516,6 +3522,11 @@ 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+\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 \t}\n \tif (unlikely(leftover > 0)) {\n \t\tfor (i = 0; i < leftover; i++) {\n@@ -3523,6 +3534,9 @@ 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+\t\t\t/* Increment bytes counter */\n+\t\t\ttxq->basic_stats.bytes += pkts[mainpart + i]->pkt_len;\n \t\t}\n \t}\n }\n@@ -3661,6 +3675,8 @@ 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+\t\t/* Increment bytes counter */\n+\t\ttxq->basic_stats.bytes += tx_pkt->pkt_len;\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..68f098f 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,9 @@ 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+\t\t\t/* Increment bytes counter */\n+\t\t\ttxq->basic_stats.bytes += (*tx_pkts)->pkt_len;\n \t\t}\n \n \t\tnb_commit -= n;\n@@ -72,6 +75,9 @@ 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+\t\t/* Increment bytes counter */\n+\t\ttxq->basic_stats.bytes += (*tx_pkts)->pkt_len;\n \t}\n \n \tnext_to_use += nb_commit;\n@@ -116,6 +122,9 @@ 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+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += pkt->pkt_len;\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..2a22a1a 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,9 @@ 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+\t\t/* Increment bytes counter */\n+\t\trxq->basic_stats.bytes += rx_pkts[i]->pkt_len;\n \t}\n \n \treturn retcode;\n@@ -408,6 +411,11 @@ 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+\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+\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 e0e40ca..777d36a 100644\n--- a/drivers/net/hns3/hns3_stats.c\n+++ b/drivers/net/hns3/hns3_stats.c\n@@ -358,6 +358,7 @@ static const struct hns3_xstats_name_offset hns3_tx_queue_strings[] = {\n \t\t\t HNS3_NUM_RESET_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@@ -543,16 +544,26 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)\n \t\treturn ret;\n \t}\n \n-\t/* Get the error stats of received packets */\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+\t\t\trte_stats->ibytes += rxq->basic_stats.bytes;\n \t\t}\n \t}\n \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+\n \trte_stats->oerrors = 0;\n \t/*\n \t * If HW statistics are reset by stats_reset, but a lot of residual\n@@ -623,6 +634,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@@ -807,7 +819,6 @@ hns3_rxq_basic_stats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\trxq_stats->packets =\n \t\t\tstats->rcb_rx_ring_pktnum[i] > rxq_stats->errors ?\n \t\t\tstats->rcb_rx_ring_pktnum[i] - rxq_stats->errors : 0;\n-\t\trxq_stats->bytes = 0;\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@@ -836,7 +847,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@@ -1328,7 +1339,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 */\n", "prefixes": [ "V3", "04/14" ] }