Skip to content

Commit

Permalink
ethdev: clarify null location case in xstats get
Browse files Browse the repository at this point in the history
[ upstream commit 485df8847a2c0ecf947a514f634b8180b725b827 ]

When xstats location is null in rte_eth_xstats_get() the return value
is not clearly specified.  Some PMDs (eg. hns3/ipn3ke/mvpp2/axgbe) return
zero while others return the required number of elements.

In this patch, special parameter combinations are restricted:
 1. highlight that xstats location may be null if and only if n is 0.
 2. amend n parameter description to specify that if n is lower than
    the required number of elements, the function returns the required
    number of elements.
 3. specify that if n is zero, the xstats must be NULL, the function
    returns the required number of elements (a duplicate which should
    help to not very attentive readers).

Add sanity check for null xstats and non-zero n case on API level to
make it unnecessary to care about it in drivers.

Fixes: ce757f5 ("ethdev: new method to retrieve extended statistics")

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
  • Loading branch information
fengchengwen authored and cpaelzer committed Jul 7, 2022
1 parent fa9bd21 commit 530d754
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 3 additions & 2 deletions lib/librte_ethdev/rte_ethdev.c
Expand Up @@ -2862,7 +2862,8 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,
int ret;

RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);

if (xstats == NULL && n > 0)
return -EINVAL;
dev = &rte_eth_devices[port_id];

nb_rxqs = RTE_MIN(dev->data->nb_rx_queues, RTE_ETHDEV_QUEUE_STAT_CNTRS);
Expand All @@ -2878,7 +2879,7 @@ rte_eth_xstats_get(uint16_t port_id, struct rte_eth_xstat *xstats,
* xstats struct.
*/
xcount = (*dev->dev_ops->xstats_get)(dev,
xstats ? xstats + count : NULL,
(n > count) ? xstats + count : NULL,
(n > count) ? n - count : 0);

if (xcount < 0)
Expand Down
6 changes: 5 additions & 1 deletion lib/librte_ethdev/rte_ethdev.h
Expand Up @@ -2363,9 +2363,13 @@ int rte_eth_xstats_get_names(uint16_t port_id,
* @param xstats
* A pointer to a table of structure of type *rte_eth_xstat*
* to be filled with device statistics ids and values.
* This parameter can be set to NULL if n is 0.
* This parameter can be set to NULL if and only if n is 0.
* @param n
* The size of the xstats array (number of elements).
* If lower than the required number of elements, the function returns
* the required number of elements.
* If equal to zero, the xstats must be NULL, the function returns the
* required number of elements.
* @return
* - A positive value lower or equal to n: success. The return value
* is the number of entries filled in the stats table.
Expand Down

0 comments on commit 530d754

Please sign in to comment.