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 C6F10A034D for ; Mon, 17 Aug 2020 11:26:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BD4841C123; Mon, 17 Aug 2020 11:26:15 +0200 (CEST) Received: from mail.chinasoftinc.com (unknown [114.113.233.8]) by dpdk.org (Postfix) with ESMTP id D8CD51C134 for ; Mon, 17 Aug 2020 11:26:11 +0200 (CEST) Received: from localhost.localdomain (120.133.139.157) by INCCAS001.ito.icss (10.168.0.60) with Microsoft SMTP Server id 14.3.487.0; Mon, 17 Aug 2020 17:25:42 +0800 From: "Wei Hu (Xavier)" To: CC: Date: Mon, 17 Aug 2020 17:25:17 +0800 Message-ID: <20200817092532.59530-10-huwei013@chinasoftinc.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200817092532.59530-1-huwei013@chinasoftinc.com> References: <20200817092532.59530-1-huwei013@chinasoftinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [120.133.139.157] Subject: [dpdk-stable] [PATCH 09/24] net/hns3: get Rx/Tx queue fbd in xstats X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Chengwen Feng [ upstream commit 4016d76b7c54db9b292e5a90db53029980e91f74 ] This patch adds getting Rx/Tx queue fbd information in extended device statistics. The upper level application can get them by calling the rte_eth_xstats_get API function. The fbd registers of every Rx/Tx queue are very useful to identify the Rx/Tx bottleneck. 1. The Rx queue fbd register is the number of the unprocessed buffer descriptors which are waiting for driver to process; 2. The Tx queue fbd register is the number of the unprocessed buffer descriptors which are waiting for network engine hardware to process. As a result, we get the following output information in testpmd application by using the command "show port xstats" as below: rx_q0RX_QUEUE_FBD: 19 rx_q1RX_QUEUE_FBD: 18 tx_q0TX_QUEUE_FBD: 0 tx_q1TX_QUEUE_FBD: 0 Signed-off-by: Chengwen Feng Signed-off-by: Wei Hu (Xavier) Signed-off-by: Huisong Li --- drivers/net/hns3/hns3_stats.c | 174 +++++++++++++++++----------------- drivers/net/hns3/hns3_stats.h | 3 +- 2 files changed, 90 insertions(+), 87 deletions(-) diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index 10cc7570c..e03ffbbd6 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -13,6 +13,7 @@ #include "hns3_ethdev.h" #include "hns3_rxtx.h" #include "hns3_logs.h" +#include "hns3_regs.h" /* MAC statistics */ static const struct hns3_xstats_name_offset hns3_mac_strings[] = { @@ -233,6 +234,16 @@ static const struct hns3_xstats_name_offset hns3_rx_bd_error_strings[] = { HNS3_RX_BD_ERROR_STATS_FIELD_OFFSET(ol4_csum_erros)} }; +/* The statistic of rx queue */ +static const struct hns3_xstats_name_offset hns3_rx_queue_strings[] = { + {"RX_QUEUE_FBD", HNS3_RING_RX_FBDNUM_REG} +}; + +/* The statistic of tx queue */ +static const struct hns3_xstats_name_offset hns3_tx_queue_strings[] = { + {"TX_QUEUE_FBD", HNS3_RING_TX_FBDNUM_REG} +}; + #define HNS3_NUM_MAC_STATS (sizeof(hns3_mac_strings) / \ sizeof(hns3_mac_strings[0])) @@ -245,6 +256,12 @@ static const struct hns3_xstats_name_offset hns3_rx_bd_error_strings[] = { #define HNS3_NUM_RX_BD_ERROR_XSTATS (sizeof(hns3_rx_bd_error_strings) / \ sizeof(hns3_rx_bd_error_strings[0])) +#define HNS3_NUM_RX_QUEUE_STATS (sizeof(hns3_rx_queue_strings) / \ + sizeof(hns3_rx_queue_strings[0])) + +#define HNS3_NUM_TX_QUEUE_STATS (sizeof(hns3_tx_queue_strings) / \ + sizeof(hns3_tx_queue_strings[0])) + #define HNS3_FIX_NUM_STATS (HNS3_NUM_MAC_STATS + HNS3_NUM_ERROR_INT_XSTATS + \ HNS3_NUM_RESET_XSTATS) @@ -547,13 +564,16 @@ static int hns3_xstats_calc_num(struct rte_eth_dev *dev) { struct hns3_adapter *hns = dev->data->dev_private; + int bderr_stats = dev->data->nb_rx_queues * HNS3_NUM_RX_BD_ERROR_XSTATS; + int rx_queue_stats = dev->data->nb_rx_queues * HNS3_NUM_RX_QUEUE_STATS; + int tx_queue_stats = dev->data->nb_tx_queues * HNS3_NUM_TX_QUEUE_STATS; if (hns->is_vf) - return dev->data->nb_rx_queues * HNS3_NUM_RX_BD_ERROR_XSTATS + - HNS3_NUM_RESET_XSTATS; + return bderr_stats + rx_queue_stats + tx_queue_stats + + HNS3_NUM_RESET_XSTATS; else - return dev->data->nb_rx_queues * HNS3_NUM_RX_BD_ERROR_XSTATS + - HNS3_FIX_NUM_STATS; + return bderr_stats + rx_queue_stats + tx_queue_stats + + HNS3_FIX_NUM_STATS; } /* @@ -579,6 +599,7 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, struct hns3_mac_stats *mac_stats = &hw->mac_stats; struct hns3_reset_stats *reset_stats = &hw->reset.stats; struct hns3_rx_queue *rxq; + uint32_t reg_offset; uint16_t i, j; char *addr; int count; @@ -627,7 +648,7 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, } /* Get the Rx BD errors stats */ - for (j = 0; j != dev->data->nb_rx_queues; ++j) { + 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; @@ -637,6 +658,30 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, } } + /* Get rx queue stats */ + for (j = 0; j < dev->data->nb_rx_queues; j++) { + for (i = 0; i < HNS3_NUM_RX_QUEUE_STATS; i++) { + reg_offset = HNS3_TQP_REG_OFFSET + + HNS3_TQP_REG_SIZE * j; + xstats[count].value = hns3_read_dev(hw, + reg_offset + hns3_rx_queue_strings[i].offset); + xstats[count].id = count; + count++; + } + } + + /* Get tx queue stats */ + for (j = 0; j < dev->data->nb_tx_queues; j++) { + for (i = 0; i < HNS3_NUM_TX_QUEUE_STATS; i++) { + reg_offset = HNS3_TQP_REG_OFFSET + + HNS3_TQP_REG_SIZE * j; + xstats[count].value = hns3_read_dev(hw, + reg_offset + hns3_tx_queue_strings[i].offset); + xstats[count].id = count; + count++; + } + } + return count; } @@ -665,7 +710,7 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, * is the number of entries filled in the stats table. */ int -hns3_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, +hns3_dev_xstats_get_names(struct rte_eth_dev *dev, struct rte_eth_xstat_name *xstats_names, __rte_unused unsigned int size) { @@ -711,6 +756,24 @@ hns3_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, } } + for (j = 0; j < dev->data->nb_rx_queues; j++) { + for (i = 0; i < HNS3_NUM_RX_QUEUE_STATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "rx_q%u%s", j, hns3_rx_queue_strings[i].name); + count++; + } + } + + for (j = 0; j < dev->data->nb_tx_queues; j++) { + for (i = 0; i < HNS3_NUM_TX_QUEUE_STATS; i++) { + snprintf(xstats_names[count].name, + sizeof(xstats_names[count].name), + "tx_q%u%s", j, hns3_tx_queue_strings[i].name); + count++; + } + } + return count; } @@ -741,18 +804,13 @@ int hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, uint64_t *values, uint32_t size) { + const uint32_t cnt_stats = hns3_xstats_calc_num(dev); struct hns3_adapter *hns = dev->data->dev_private; - struct hns3_pf *pf = &hns->pf; + struct rte_eth_xstat *values_copy; 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; - const uint32_t cnt_stats = hns3_xstats_calc_num(dev); - uint64_t *values_copy; + uint32_t count_value; uint64_t len; - uint32_t count = 0; - uint16_t i, j; - char *addr; + uint32_t i; int ret; if (ids == NULL || size < cnt_stats) @@ -765,7 +823,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, return ret; } - len = cnt_stats * HNS3_VALUES_BYTES; + len = cnt_stats * sizeof(struct rte_eth_xstat); values_copy = rte_zmalloc("hns3_xstats_values", len, 0); if (values_copy == NULL) { hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed " @@ -773,36 +831,10 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, 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++; - } + count_value = hns3_dev_xstats_get(dev, values_copy, cnt_stats); + if (count_value != cnt_stats) { + rte_free(values_copy); + return -EINVAL; } for (i = 0; i < size; i++) { @@ -812,7 +844,8 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, rte_free(values_copy); return -EINVAL; } - memcpy(&values[i], &values_copy[ids[i]], sizeof(values[i])); + memcpy(&values[i], &values_copy[ids[i]].value, + sizeof(values[i])); } rte_free(values_copy); @@ -845,67 +878,38 @@ 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) { + const uint32_t cnt_stats = hns3_xstats_calc_num(dev); struct hns3_adapter *hns = dev->data->dev_private; - struct rte_eth_xstat_name *xstats_names_copy; + struct rte_eth_xstat_name *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; + uint32_t i; 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) { + names_copy = rte_zmalloc("hns3_xstats_names", len, 0); + if (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++; - } - } + (void)hns3_dev_xstats_get_names(dev, names_copy, cnt_stats); 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); + rte_free(names_copy); return -EINVAL; } snprintf(xstats_names[i].name, sizeof(xstats_names[i].name), - "%s", xstats_names_copy[ids[i]].name); + "%s", names_copy[ids[i]].name); } - rte_free(xstats_names_copy); + rte_free(names_copy); return size; } diff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h index 365bae083..0993c5f57 100644 --- a/drivers/net/hns3/hns3_stats.h +++ b/drivers/net/hns3/hns3_stats.h @@ -9,7 +9,6 @@ #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 { @@ -137,7 +136,7 @@ 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, +int hns3_dev_xstats_get_names(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, -- 2.27.0