7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
133 lines
4.0 KiB
Diff
133 lines
4.0 KiB
Diff
From 8626a054e516796e942019ce4a1e22d6d8fcd3ee Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:05 +0800
|
|
Subject: [PATCH 129/189] net/hns3: fix statistics locking
|
|
|
|
The stats_lock is used to protect statistics update in stats APIs and
|
|
periodic task, but current code only protect queue related statistics.
|
|
|
|
Fixes: a65342d9d5d2 ("net/hns3: fix MAC and queues HW statistics overflow")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_stats.c | 22 +++++++++-------------
|
|
1 file changed, 9 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c
|
|
index bf8af4531f..d56d3ec174 100644
|
|
--- a/drivers/net/hns3/hns3_stats.c
|
|
+++ b/drivers/net/hns3/hns3_stats.c
|
|
@@ -629,6 +629,7 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
|
|
uint16_t i;
|
|
int ret;
|
|
|
|
+ rte_spinlock_lock(&hw->stats_lock);
|
|
/* Update imissed stats */
|
|
ret = hns3_update_imissed_stats(hw, false);
|
|
if (ret) {
|
|
@@ -644,10 +645,7 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
|
|
if (rxq == NULL)
|
|
continue;
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
hns3_rcb_rx_ring_stats_get(rxq, stats);
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
-
|
|
rte_stats->ierrors += rxq->err_stats.l2_errors +
|
|
rxq->err_stats.pkt_len_errors;
|
|
rte_stats->ibytes += rxq->basic_stats.bytes;
|
|
@@ -659,9 +657,7 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
|
|
if (txq == NULL)
|
|
continue;
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
hns3_rcb_tx_ring_stats_get(txq, stats);
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
rte_stats->obytes += txq->basic_stats.bytes;
|
|
}
|
|
|
|
@@ -683,7 +679,10 @@ hns3_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *rte_stats)
|
|
rte_stats->opackets = stats->rcb_tx_ring_pktnum_rcd -
|
|
rte_stats->oerrors;
|
|
rte_stats->rx_nombuf = eth_dev->data->rx_mbuf_alloc_failed;
|
|
+
|
|
out:
|
|
+ rte_spinlock_unlock(&hw->stats_lock);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
@@ -697,6 +696,7 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
|
|
uint16_t i;
|
|
int ret;
|
|
|
|
+ rte_spinlock_lock(&hw->stats_lock);
|
|
/*
|
|
* Note: Reading hardware statistics of imissed registers will
|
|
* clear them.
|
|
@@ -732,7 +732,6 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
|
|
if (rxq == NULL)
|
|
continue;
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
memset(&rxq->basic_stats, 0,
|
|
sizeof(struct hns3_rx_basic_stats));
|
|
|
|
@@ -740,7 +739,6 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
|
|
(void)hns3_read_dev(rxq, HNS3_RING_RX_PKTNUM_RECORD_REG);
|
|
rxq->err_stats.pkt_len_errors = 0;
|
|
rxq->err_stats.l2_errors = 0;
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
}
|
|
|
|
/* Clear all the stats of a txq in a loop to keep them synchronized */
|
|
@@ -749,19 +747,18 @@ hns3_stats_reset(struct rte_eth_dev *eth_dev)
|
|
if (txq == NULL)
|
|
continue;
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
memset(&txq->basic_stats, 0,
|
|
sizeof(struct hns3_tx_basic_stats));
|
|
|
|
/* This register is read-clear */
|
|
(void)hns3_read_dev(txq, HNS3_RING_TX_PKTNUM_RECORD_REG);
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
}
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
hns3_tqp_stats_clear(hw);
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
+
|
|
out:
|
|
+ rte_spinlock_unlock(&hw->stats_lock);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
@@ -1082,11 +1079,11 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
|
|
count++;
|
|
}
|
|
}
|
|
- rte_spinlock_unlock(&hw->stats_lock);
|
|
|
|
ret = hns3_update_imissed_stats(hw, false);
|
|
if (ret) {
|
|
hns3_err(hw, "update imissed stats failed, ret = %d", ret);
|
|
+ rte_spinlock_unlock(&hw->stats_lock);
|
|
return ret;
|
|
}
|
|
|
|
@@ -1115,7 +1112,6 @@ hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
|
|
}
|
|
}
|
|
|
|
- rte_spinlock_lock(&hw->stats_lock);
|
|
hns3_tqp_dfx_stats_get(dev, xstats, &count);
|
|
hns3_queue_stats_get(dev, xstats, &count);
|
|
rte_spinlock_unlock(&hw->stats_lock);
|
|
--
|
|
2.23.0
|
|
|