b381e82182
sync patches from 22.07 for hns3, dma and testpmd etc. Signed-off-by: Dongdong Liu <liudongdong3@huawei.com> (cherry picked from commit 7beb6a72fff2920a2d993030b0b02822249707fb)
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From a6cce2fd3fb2eda175989fd4a6dbfdd470a08189 Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Fri, 13 May 2022 10:53:50 +0800
|
|
Subject: [PATCH 088/122] ethdev: simplify xstats get implementation
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use eth_dev_get_xstats_basic_count() to retrieve generic statistics count.
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Acked-by: Morten Brørup <mb@smartsharesystems.com>
|
|
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
|
|
---
|
|
lib/ethdev/rte_ethdev.c | 11 ++---------
|
|
1 file changed, 2 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
|
|
index b4a331b671..6110cd1893 100644
|
|
--- a/lib/ethdev/rte_ethdev.c
|
|
+++ b/lib/ethdev/rte_ethdev.c
|
|
@@ -3313,9 +3313,8 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,
|
|
unsigned int n)
|
|
{
|
|
struct rte_eth_dev *dev;
|
|
- unsigned int count = 0, i;
|
|
+ unsigned int count, i;
|
|
signed int xcount = 0;
|
|
- uint16_t nb_rxqs, nb_txqs;
|
|
int ret;
|
|
|
|
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
|
|
@@ -3323,13 +3322,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,
|
|
return -EINVAL;
|
|
dev = &rte_eth_devices[port_id];
|
|
|
|
- nb_rxqs = RTE_MIN(dev->data->nb_rx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS);
|
|
- nb_txqs = RTE_MIN(dev->data->nb_tx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS);
|
|
-
|
|
- /* Return generic statistics */
|
|
- count = RTE_NB_STATS;
|
|
- if (dev->data->dev_flags & RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS)
|
|
- count += (nb_rxqs * RTE_NB_RXQ_STATS) + (nb_txqs * RTE_NB_TXQ_STATS);
|
|
+ count = eth_dev_get_xstats_basic_count(dev);
|
|
|
|
/* implemented by the driver */
|
|
if (dev->dev_ops->xstats_get != NULL) {
|
|
--
|
|
2.22.0
|
|
|