d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethdev: fix xstats get by id APIs

Browse Source 
xstats _by_id() APIs are broken because ids known by user sent directly
to the PMDs.

ethdev xstat get by id APIs:
rte_eth_xstats_get_names_by_id() and rte_eth_xstats_get_by_id()
work on ids calculated as "basic stats + extended stats"

When an application asking for id less than "basic stats count", it is
indeed asking basic stats not extended stats.

The dev_ops PMDs implements work on extended stats ids.

This patch adds a check if all requested stats are xstats and if so
converts ids to xstats ids before passing them to PMDs.

This conversion wasn't required before commit 8c49d5f1c219, because
_by_id dev_ops were always used to get whole stats via NULL ids.

Fixes: 8c49d5f1c219 ("ethdev: rework xstats retrieve by id")
Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Tested-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Ferruh Yigit 2017-10-18 23:51:43 +01:00
parent 2624e2f40a
commit 47ad869546
1 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/librte_ether/rte_ethdev.c
View File

@ -1657,6 +1657,7 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
uint64_t *ids) uint64_t *ids)
{ {
struct rte_eth_xstat_name *xstats_names_copy; struct rte_eth_xstat_name *xstats_names_copy;
unsigned int no_basic_stat_requested = 1;
unsigned int expected_entries; unsigned int expected_entries;
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
unsigned int i; unsigned int i;
@ -1676,9 +1677,27 @@ rte_eth_xstats_get_names_by_id(uint16_t port_id,
if (ids && !xstats_names) if (ids && !xstats_names)
return -EINVAL; return -EINVAL;
if (dev->dev_ops->xstats_get_names_by_id != NULL) if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
return (*dev->dev_ops->xstats_get_names_by_id)( unsigned int basic_count = get_xstats_basic_count(dev);
dev, xstats_names, ids, size); uint64_t ids_copy[size];
for (i = 0; i < size; i++) {
if (ids[i] < basic_count) {
no_basic_stat_requested = 0;
break;
}
/*
* Convert ids to xstats ids that PMD knows.
* ids known by user are basic + extended stats.
*/
ids_copy[i] = ids[i] - basic_count;
}
if (no_basic_stat_requested)
return (*dev->dev_ops->xstats_get_names_by_id)(dev,
xstats_names, ids_copy, size);
}
/* Retrieve all stats */ /* Retrieve all stats */
if (!ids) { if (!ids) {
@ -1785,6 +1804,7 @@ int
rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids, rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,
uint64_t *values, unsigned int size) uint64_t *values, unsigned int size)
{ {
unsigned int no_basic_stat_requested = 1;
unsigned int num_xstats_filled; unsigned int num_xstats_filled;
uint16_t expected_entries; uint16_t expected_entries;
struct rte_eth_dev *dev; struct rte_eth_dev *dev;
@ -1806,9 +1826,27 @@ rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,
if (ids && !values) if (ids && !values)
return -EINVAL; return -EINVAL;
if (dev->dev_ops->xstats_get_by_id != NULL) if (ids && dev->dev_ops->xstats_get_by_id != NULL && size) {
return (*dev->dev_ops->xstats_get_by_id)(dev, ids, values, unsigned int basic_count = get_xstats_basic_count(dev);
size); uint64_t ids_copy[size];
for (i = 0; i < size; i++) {
if (ids[i] < basic_count) {
no_basic_stat_requested = 0;
break;
}
/*
* Convert ids to xstats ids that PMD knows.
* ids known by user are basic + extended stats.
*/
ids_copy[i] = ids[i] - basic_count;
}
if (no_basic_stat_requested)
return (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy,
values, size);
}
/* Fill the xstats structure */ /* Fill the xstats structure */
num_xstats_filled = rte_eth_xstats_get(port_id, xstats, num_xstats_filled = rte_eth_xstats_get(port_id, xstats,