3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
125 lines
3.3 KiB
Diff
125 lines
3.3 KiB
Diff
From afd493a7e66236c538bf9ab7feb332200cbd2e76 Mon Sep 17 00:00:00 2001
|
|
From: "Min Hu (Connor)" <humin29@huawei.com>
|
|
Date: Tue, 23 Mar 2021 19:21:05 +0800
|
|
Subject: [PATCH 064/189] net/hns3: support oerrors stats in PF
|
|
|
|
This patch added oerrors stats for PF in kunpeng930.
|
|
|
|
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_ethdev.h | 1 +
|
|
drivers/net/hns3/hns3_stats.c | 64 +++++++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 64 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
|
|
index 01561cc..6800ee0 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.h
|
|
+++ b/drivers/net/hns3/hns3_ethdev.h
|
|
@@ -443,6 +443,7 @@ struct hns3_hw {
|
|
/* Include Mac stats | Rx stats | Tx stats */
|
|
struct hns3_mac_stats mac_stats;
|
|
struct hns3_rx_missed_stats imissed_stats;
|
|
+ uint64_t oerror_stats;
|
|
uint32_t fw_version;
|
|
|
|
uint16_t num_msi;
|
|
diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c
|
|
index e802c0b..1af689f 100644
|
|
--- a/drivers/net/hns3/hns3_stats.c
|
|
+++ b/drivers/net/hns3/hns3_stats.c
|
|
@@ -519,6 +519,31 @@ hns3_update_port_rx_ssu_drop_stats(struct hns3_hw *hw)
|
|
return 0;
|
|
}
|
|
|
|
+static int
|
|
+hns3_update_port_tx_ssu_drop_stats(struct hns3_hw *hw)
|
|
+{
|
|
+ struct hns3_cmd_desc desc[HNS3_OPC_SSU_DROP_REG_NUM];
|
|
+ struct hns3_query_ssu_cmd *req;
|
|
+ uint64_t cnt;
|
|
+ int ret;
|
|
+
|
|
+ ret = hns3_get_ssu_drop_stats(hw, desc, HNS3_OPC_SSU_DROP_REG_NUM,
|
|
+ false);
|
|
+ if (ret) {
|
|
+ hns3_err(hw, "failed to get Tx SSU drop stats, ret = %d", ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ req = (struct hns3_query_ssu_cmd *)desc[0].data;
|
|
+ cnt = rte_le_to_cpu_32(req->oq_drop_cnt) +
|
|
+ rte_le_to_cpu_32(req->full_drop_cnt) +
|
|
+ rte_le_to_cpu_32(req->part_drop_cnt);
|
|
+
|
|
+ hw->oerror_stats += cnt;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int
|
|
hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear)
|
|
{
|
|
@@ -544,6 +569,25 @@ hns3_update_imissed_stats(struct hns3_hw *hw, bool is_clear)
|
|
return 0;
|
|
}
|
|
|
|
+static int
|
|
+hns3_update_oerror_stats(struct hns3_hw *hw, bool is_clear)
|
|
+{
|
|
+ struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
|
|
+ int ret;
|
|
+
|
|
+ if (hw->drop_stats_mode == HNS3_PKTS_DROP_STATS_MODE1 || hns->is_vf)
|
|
+ return 0;
|
|
+
|
|
+ ret = hns3_update_port_tx_ssu_drop_stats(hw);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ if (is_clear)
|
|
+ hw->oerror_stats = 0;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/*
|
|
* Query tqp tx queue statistics ,opcode id: 0x0B03.
|
|
* Query tqp rx queue statistics ,opcode id: 0x0B13.
|
|
@@ -608,7 +652,14 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
|
|
rte_stats->obytes += txq->basic_stats.bytes;
|
|
}
|
|
|
|
- rte_stats->oerrors = 0;
|
|
+ ret = hns3_update_oerror_stats(hw, false);
|
|
+ if (ret) {
|
|
+ hns3_err(hw, "update oerror stats failed, ret = %d",
|
|
+ ret);
|
|
+ return ret;
|
|
+ }
|
|
+ rte_stats->oerrors = hw->oerror_stats;
|
|
+
|
|
/*
|
|
* If HW statistics are reset by stats_reset, but a lot of residual
|
|
* packets exist in the hardware queue and these packets are error
|
|
@@ -644,6 +695,17 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
|
|
return ret;
|
|
}
|
|
|
|
+ /*
|
|
+ * Note: Reading hardware statistics of oerror registers will
|
|
+ * clear them.
|
|
+ */
|
|
+ ret = hns3_update_oerror_stats(hw, true);
|
|
+ if (ret) {
|
|
+ hns3_err(hw, "clear oerror stats failed, ret = %d",
|
|
+ ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
|
|
rxq = eth_dev->data->rx_queues[i];
|
|
if (rxq == NULL)
|
|
--
|
|
2.7.4
|
|
|