* [dpdk-dev] [PATCH 1/2] net/hns3: modify the format for firmware version
2020-04-21 3:32 [dpdk-dev] [PATCH 0/2] updates for hns3 PMD driver Wei Hu (Xavier)
@ 2020-04-21 3:32 ` Wei Hu (Xavier)
2020-04-21 3:32 ` [dpdk-dev] [PATCH 2/2] net/hns3: get Rx/Tx queue fbd in extend device statistics Wei Hu (Xavier)
2020-04-21 17:21 ` [dpdk-dev] [PATCH 0/2] updates for hns3 PMD driver Ferruh Yigit
2 siblings, 0 replies; 4+ messages in thread
From: Wei Hu (Xavier) @ 2020-04-21 3:32 UTC (permalink / raw)
To: dev
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
This patch modifies the print format for firmware version in the log, It
replaces "0x%08x" with "%lu.%lu.%lu.%lu" in the format control string.
By the way, this patch adds ".fw_version_get" ops implemation for hns3 VF
PMD driver.
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
drivers/net/hns3/hns3_cmd.c | 14 ++++++++++++--
drivers/net/hns3/hns3_cmd.h | 8 ++++++++
drivers/net/hns3/hns3_dcb.c | 14 ++++++++++++--
drivers/net/hns3/hns3_ethdev.c | 11 ++++++++++-
drivers/net/hns3/hns3_ethdev_vf.c | 26 ++++++++++++++++++++++++++
5 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index c7993634e..cbb09887c 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -490,6 +490,7 @@ hns3_cmd_init_queue(struct hns3_hw *hw)
int
hns3_cmd_init(struct hns3_hw *hw)
{
+ uint32_t version;
int ret;
rte_spinlock_lock(&hw->cmq.csq.lock);
@@ -518,13 +519,22 @@ hns3_cmd_init(struct hns3_hw *hw)
}
rte_atomic16_clear(&hw->reset.disable_cmd);
- ret = hns3_cmd_query_firmware_version(hw, &hw->fw_version);
+ ret = hns3_cmd_query_firmware_version(hw, &version);
if (ret) {
PMD_INIT_LOG(ERR, "firmware version query failed %d", ret);
goto err_cmd_init;
}
- PMD_INIT_LOG(INFO, "The firmware version is %08x", hw->fw_version);
+ hw->fw_version = version;
+ PMD_INIT_LOG(INFO, "The firmware version is %lu.%lu.%lu.%lu",
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+ HNS3_FW_VERSION_BYTE3_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+ HNS3_FW_VERSION_BYTE2_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+ HNS3_FW_VERSION_BYTE1_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+ HNS3_FW_VERSION_BYTE0_S));
return 0;
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index 26d410396..da770ac95 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -253,6 +253,14 @@ struct hns3_rx_priv_buff_cmd {
uint8_t rsv[6];
};
+#define HNS3_FW_VERSION_BYTE3_S 24
+#define HNS3_FW_VERSION_BYTE3_M GENMASK(31, 24)
+#define HNS3_FW_VERSION_BYTE2_S 16
+#define HNS3_FW_VERSION_BYTE2_M GENMASK(23, 16)
+#define HNS3_FW_VERSION_BYTE1_S 8
+#define HNS3_FW_VERSION_BYTE1_M GENMASK(15, 8)
+#define HNS3_FW_VERSION_BYTE0_S 0
+#define HNS3_FW_VERSION_BYTE0_M GENMASK(7, 0)
struct hns3_query_version_cmd {
uint32_t firmware;
uint32_t firmware_rsv[5];
diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 3fde222dc..ada6fc634 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -787,6 +787,7 @@ hns3_dcb_pri_dwrr_cfg(struct hns3_hw *hw)
{
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
struct hns3_pf *pf = &hns->pf;
+ uint32_t version;
int ret;
if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE)
@@ -801,8 +802,17 @@ hns3_dcb_pri_dwrr_cfg(struct hns3_hw *hw)
ret = hns3_dcb_ets_tc_dwrr_cfg(hw);
if (ret == -EOPNOTSUPP) {
- hns3_warn(hw, "fw %08x does't support ets tc weight cmd",
- hw->fw_version);
+ version = hw->fw_version;
+ hns3_warn(hw,
+ "fw %lu.%lu.%lu.%lu does't support ets tc weight cmd",
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+ HNS3_FW_VERSION_BYTE3_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+ HNS3_FW_VERSION_BYTE2_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+ HNS3_FW_VERSION_BYTE1_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+ HNS3_FW_VERSION_BYTE0_S));
ret = 0;
}
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 3e3a8c5f4..c314d3711 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2508,9 +2508,18 @@ hns3_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
{
struct hns3_adapter *hns = eth_dev->data->dev_private;
struct hns3_hw *hw = &hns->hw;
+ uint32_t version = hw->fw_version;
int ret;
- ret = snprintf(fw_version, fw_size, "0x%08x", hw->fw_version);
+ ret = snprintf(fw_version, fw_size, "%lu.%lu.%lu.%lu",
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+ HNS3_FW_VERSION_BYTE3_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+ HNS3_FW_VERSION_BYTE2_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+ HNS3_FW_VERSION_BYTE1_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+ HNS3_FW_VERSION_BYTE0_S));
ret += 1; /* add the size of '\0' */
if (fw_size < (uint32_t)ret)
return ret;
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 391079b8e..93631872d 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1763,6 +1763,31 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
hns3_warn(hw, "Close port %d finished", hw->data->port_id);
}
+static int
+hns3vf_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
+ size_t fw_size)
+{
+ struct hns3_adapter *hns = eth_dev->data->dev_private;
+ struct hns3_hw *hw = &hns->hw;
+ uint32_t version = hw->fw_version;
+ int ret;
+
+ ret = snprintf(fw_version, fw_size, "%lu.%lu.%lu.%lu",
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE3_M,
+ HNS3_FW_VERSION_BYTE3_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE2_M,
+ HNS3_FW_VERSION_BYTE2_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE1_M,
+ HNS3_FW_VERSION_BYTE1_S),
+ hns3_get_field(version, HNS3_FW_VERSION_BYTE0_M,
+ HNS3_FW_VERSION_BYTE0_S));
+ ret += 1; /* add the size of '\0' */
+ if (fw_size < (uint32_t)ret)
+ return ret;
+ else
+ return 0;
+}
+
static int
hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,
__rte_unused int wait_to_complete)
@@ -2347,6 +2372,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
.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,
+ .fw_version_get = hns3vf_fw_version_get,
.rx_queue_setup = hns3_rx_queue_setup,
.tx_queue_setup = hns3_tx_queue_setup,
.rx_queue_release = hns3_dev_rx_queue_release,
--
2.23.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH 2/2] net/hns3: get Rx/Tx queue fbd in extend device statistics
2020-04-21 3:32 [dpdk-dev] [PATCH 0/2] updates for hns3 PMD driver Wei Hu (Xavier)
2020-04-21 3:32 ` [dpdk-dev] [PATCH 1/2] net/hns3: modify the format for firmware version Wei Hu (Xavier)
@ 2020-04-21 3:32 ` Wei Hu (Xavier)
2020-04-21 17:21 ` [dpdk-dev] [PATCH 0/2] updates for hns3 PMD driver Ferruh Yigit
2 siblings, 0 replies; 4+ messages in thread
From: Wei Hu (Xavier) @ 2020-04-21 3:32 UTC (permalink / raw)
To: dev
From: Chengwen Feng <fengchengwen@huawei.com>
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 applcation
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 <fengchengwen@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Huisong Li <lihuisong@huawei.com>
---
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 b3797ec53..2891875f4 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)
@@ -541,13 +558,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;
}
/*
@@ -573,6 +593,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;
@@ -621,7 +642,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;
@@ -631,6 +652,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;
}
@@ -659,7 +704,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)
{
@@ -705,6 +750,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;
}
@@ -735,18 +798,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)
@@ -759,7 +817,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 "
@@ -767,36 +825,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++) {
@@ -806,7 +838,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);
@@ -839,67 +872,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.23.0
^ permalink raw reply [flat|nested] 4+ messages in thread