From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: "Morten Brørup" <mb@smartsharesystems.com>,
"Akhil Goyal" <gakhil@marvell.com>,
"Aman Singh" <aman.deep.singh@intel.com>,
"Anatoly Burakov" <anatoly.burakov@intel.com>,
"Andrew Rybchenko" <andrew.rybchenko@oktetlabs.ru>,
"Bruce Richardson" <bruce.richardson@intel.com>,
"Chengwen Feng" <fengchengwen@huawei.com>,
"Dariusz Sosnowski" <dsosnowski@nvidia.com>,
"Dmitry Kozlyuk" <dmitry.kozliuk@gmail.com>,
"Fan Zhang" <fanzhang.oss@gmail.com>,
"Ferruh Yigit" <ferruh.yigit@amd.com>,
"Harman Kalra" <hkalra@marvell.com>,
"Harry van Haaren" <harry.van.haaren@intel.com>,
"Honnappa Nagarahalli" <honnappa.nagarahalli@arm.com>,
"Jiayu Hu" <hujiayu.hu@foxmail.com>,
"Jingjing Wu" <jingjing.wu@intel.com>,
"Kevin Laatz" <kevin.laatz@intel.com>,
"Konstantin Ananyev" <konstantin.v.ananyev@yandex.ru>,
"Matan Azrad" <matan@nvidia.com>, "Ori Kam" <orika@nvidia.com>,
"Pallavi Kadam" <pallavi.kadam@intel.com>,
"Reshma Pattan" <reshma.pattan@intel.com>,
"Sameh Gobriel" <sameh.gobriel@intel.com>,
"Suanming Mou" <suanmingm@nvidia.com>,
"Thomas Monjalon" <thomas@monjalon.net>,
"Tyler Retzlaff" <roretzla@linux.microsoft.com>,
"Viacheslav Ovsiienko" <viacheslavo@nvidia.com>,
"Vladimir Medvedkin" <vladimir.medvedkin@intel.com>,
"Volodymyr Fialko" <vfialko@marvell.com>,
"Yipeng Wang" <yipeng1.wang@intel.com>,
"Konstantin Ananyev" <konstantin.ananyev@huawei.com>
Subject: [PATCH v2 04/19] ethdev: remove use of VLAs for Windows built code
Date: Thu, 18 Apr 2024 13:02:27 -0700 [thread overview]
Message-ID: <1713470562-17415-5-git-send-email-roretzla@linux.microsoft.com> (raw)
In-Reply-To: <1713470562-17415-1-git-send-email-roretzla@linux.microsoft.com>
From: Konstantin Ananyev <konstantin.ananyev@huawei.com>
1) ./lib/ethdev/rte_ethdev.c:3244:16
: warning: ISO C90 forbids variable length array ‘xstats_names’
2) ./lib/ethdev/rte_ethdev.c:3345:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
3) ./lib/ethdev/rte_ethdev.c:3538:16
: warning: ISO C90 forbids variable length array ‘xstats’
4) ./lib/ethdev/rte_ethdev.c:3554:17
: warning: ISO C90 forbids variable length array ‘ids_copy’
For 1) and 3) - just replaced VLA with arrays allocated from heap.
As I understand xstats extraction belongs to control-path, so extra
calloc/free is hopefully acceptable.
Also ethdev xstats already doing that within
rte_eth_xstats_get_id_by_name().
For 2) and 4) changed the code to use fixed size array and call
appropriate devops function several times, if needed.
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
---
lib/ethdev/rte_ethdev.c | 183 ++++++++++++++++++++++++++++++------------------
1 file changed, 113 insertions(+), 70 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index f1c658f..e462f3d 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -36,6 +36,8 @@
#include "ethdev_trace.h"
#include "sff_telemetry.h"
+#define ETH_XSTATS_ITER_NUM 0x100
+
struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
/* public fast-path API */
@@ -3215,7 +3217,8 @@ enum {
rte_eth_xstats_get_id_by_name(uint16_t port_id, const char *xstat_name,
uint64_t *id)
{
- int cnt_xstats, idx_xstat;
+ int cnt_xstats, idx_xstat, rc;
+ struct rte_eth_xstat_name *xstats_names;
RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -3241,26 +3244,33 @@ enum {
}
/* Get id-name lookup table */
- struct rte_eth_xstat_name xstats_names[cnt_xstats];
+ xstats_names = calloc(cnt_xstats, sizeof(xstats_names[0]));
+ if (xstats_names == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
+ }
if (cnt_xstats != rte_eth_xstats_get_names_by_id(
port_id, xstats_names, cnt_xstats, NULL)) {
RTE_ETHDEV_LOG_LINE(ERR, "Cannot get xstats lookup");
+ free(xstats_names);
return -1;
}
+ rc = -EINVAL;
for (idx_xstat = 0; idx_xstat < cnt_xstats; idx_xstat++) {
if (!strcmp(xstats_names[idx_xstat].name, xstat_name)) {
*id = idx_xstat;
rte_eth_trace_xstats_get_id_by_name(port_id,
xstat_name, *id);
-
- return 0;
+ rc = 0;
+ break;
};
}
- return -EINVAL;
+ free(xstats_names);
+ return rc;
}
/* retrieve basic stats names */
@@ -3306,6 +3316,38 @@ enum {
return cnt_used_entries;
}
+static int
+eth_xstats_get_by_name_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names, uint32_t size,
+ uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+ * Convert ids to xstats ids that PMD knows.
+ * ids known by user are basic + extended stats.
+ */
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_names_by_id)(dev, ids_copy,
+ xstats_names + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
+
/* retrieve ethdev extended statistics names */
int
rte_eth_xstats_get_names_by_id(uint16_t port_id,
@@ -3313,9 +3355,8 @@ enum {
uint64_t *ids)
{
struct rte_eth_xstat_name *xstats_names_copy;
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
unsigned int expected_entries;
+ unsigned int nb_basic_stats;
unsigned int basic_count;
struct rte_eth_dev *dev;
unsigned int i;
@@ -3341,27 +3382,18 @@ enum {
if (ids && !xstats_names)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_names_by_id != NULL && size > 0) {
- 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,
- ids_copy, xstats_names, size);
+ nb_basic_stats = 0;
+ if (ids != NULL) {
+ for (i = 0; i < size; i++)
+ nb_basic_stats += (ids[i] < basic_count);
}
+ /* no baisc stats requested, devops function provided */
+ if (nb_basic_stats == 0 && ids != NULL && size != 0 &&
+ dev->dev_ops->xstats_get_names_by_id != NULL)
+ return eth_xstats_get_by_name_by_id(dev, ids, xstats_names,
+ size, basic_count);
+
/* Retrieve all stats */
if (!ids) {
int num_stats = rte_eth_xstats_get_names(port_id, xstats_names,
@@ -3380,17 +3412,8 @@ enum {
return -ENOMEM;
}
- if (ids) {
- for (i = 0; i < size; i++) {
- if (ids[i] >= basic_count) {
- no_ext_stat_requested = 0;
- break;
- }
- }
- }
-
/* Fill xstats_names_copy structure */
- if (ids && no_ext_stat_requested) {
+ if (ids && nb_basic_stats == size) {
eth_basic_stats_get_names(dev, xstats_names_copy);
} else {
ret = rte_eth_xstats_get_names(port_id, xstats_names_copy,
@@ -3514,17 +3537,47 @@ enum {
return count;
}
+static int
+eth_xtats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
+ uint64_t *values, uint32_t size, uint32_t basic_count)
+{
+ int32_t rc;
+ uint32_t i, k, m, n;
+ uint64_t ids_copy[ETH_XSTATS_ITER_NUM];
+
+ m = 0;
+ for (n = 0; n != size; n += k) {
+
+ k = RTE_MIN(size - n, RTE_DIM(ids_copy));
+
+ /*
+ * Convert ids to xstats ids that PMD knows.
+ * ids known by user are basic + extended stats.
+ */
+ for (i = 0; i < k; i++)
+ ids_copy[i] = ids[n + i] - basic_count;
+
+ rc = (*dev->dev_ops->xstats_get_by_id)(dev, ids_copy,
+ values + m, k);
+ if (rc < 0)
+ return rc;
+ m += rc;
+ }
+
+ return m;
+}
+
/* retrieve ethdev extended statistics */
int
rte_eth_xstats_get_by_id(uint16_t port_id, const uint64_t *ids,
uint64_t *values, unsigned int size)
{
- unsigned int no_basic_stat_requested = 1;
- unsigned int no_ext_stat_requested = 1;
+ unsigned int nb_basic_stats;
unsigned int num_xstats_filled;
unsigned int basic_count;
uint16_t expected_entries;
struct rte_eth_dev *dev;
+ struct rte_eth_xstat *xstats;
unsigned int i;
int ret;
@@ -3535,7 +3588,6 @@ enum {
if (ret < 0)
return ret;
expected_entries = (uint16_t)ret;
- struct rte_eth_xstat xstats[expected_entries];
basic_count = eth_dev_get_xstats_basic_count(dev);
/* Return max number of stats if no ids given */
@@ -3549,51 +3601,41 @@ enum {
if (ids && !values)
return -EINVAL;
- if (ids && dev->dev_ops->xstats_get_by_id != NULL && size) {
- unsigned int basic_count = eth_dev_get_xstats_basic_count(dev);
- 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);
+ nb_basic_stats = 0;
+ if (ids != NULL) {
+ for (i = 0; i < size; i++)
+ nb_basic_stats += (ids[i] < basic_count);
}
- if (ids) {
- for (i = 0; i < size; i++) {
- if (ids[i] >= basic_count) {
- no_ext_stat_requested = 0;
- break;
- }
- }
+ /* no baisc stats requested, devops function provided */
+ if (nb_basic_stats == 0 && ids != NULL && size != 0 &&
+ dev->dev_ops->xstats_get_by_id != NULL)
+ return eth_xtats_get_by_id(dev, ids, values, size, basic_count);
+
+ xstats = calloc(expected_entries, sizeof(xstats[0]));
+ if (xstats == NULL) {
+ RTE_ETHDEV_LOG_LINE(ERR, "Can't allocate memory");
+ return -ENOMEM;
}
/* Fill the xstats structure */
- if (ids && no_ext_stat_requested)
+ if (ids && nb_basic_stats == size)
ret = eth_basic_stats_get(port_id, xstats);
else
ret = rte_eth_xstats_get(port_id, xstats, expected_entries);
- if (ret < 0)
+ if (ret < 0) {
+ free(xstats);
return ret;
+ }
num_xstats_filled = (unsigned int)ret;
/* Return all stats */
if (!ids) {
for (i = 0; i < num_xstats_filled; i++)
values[i] = xstats[i].value;
+
+ free(xstats);
return expected_entries;
}
@@ -3601,14 +3643,15 @@ enum {
for (i = 0; i < size; i++) {
if (ids[i] >= expected_entries) {
RTE_ETHDEV_LOG_LINE(ERR, "Id value isn't valid");
- return -1;
+ break;
}
values[i] = xstats[ids[i]].value;
}
rte_eth_trace_xstats_get_by_id(port_id, ids, values, size);
- return size;
+ free(xstats);
+ return (i == size) ? (int32_t)size : -1;
}
int
--
1.8.3.1
next prev parent reply other threads:[~2024-04-18 20:03 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 23:41 [PATCH 00/16] " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 01/16] eal: include header required for alloca Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 02/16] hash: remove use of VLAs for Windows built code Tyler Retzlaff
2024-04-18 6:45 ` Morten Brørup
2024-04-17 23:41 ` [PATCH 03/16] ethdev: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 04/16] gro: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 05/16] latencystats: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 06/16] lpm: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 07/16] rcu: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 08/16] app/testpmd: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 09/16] test: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 10/16] common/idpf: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 11/16] net/i40e: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 12/16] net/ice: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 13/16] net/ixgbe: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 14/16] common/mlx5: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 15/16] net/mlx5: " Tyler Retzlaff
2024-04-17 23:41 ` [PATCH 16/16] build: enable vla warnings on " Tyler Retzlaff
2024-04-18 6:48 ` Morten Brørup
2024-04-18 15:12 ` Tyler Retzlaff
2024-04-18 15:23 ` Bruce Richardson
2024-04-18 19:22 ` Morten Brørup
2024-04-18 6:49 ` [PATCH 00/16] remove use of VLAs for " Morten Brørup
2024-04-18 12:11 ` Konstantin Ananyev
2024-04-18 15:15 ` Tyler Retzlaff
2024-04-18 15:35 ` Konstantin Ananyev
2024-04-18 20:02 ` [PATCH v2 00/19] remove use of VLAs for Windows Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 01/19] eal: include header required for alloca Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 02/19] eal/linux: remove use of VLAs Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 03/19] eal/common: " Tyler Retzlaff
2024-04-18 20:02 ` Tyler Retzlaff [this message]
2024-04-18 20:02 ` [PATCH v2 05/19] hash: remove use of VLAs for Windows built code Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 06/19] hash/thash: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 07/19] rcu: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 08/19] gro: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 09/19] latencystats: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 10/19] lpm: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 11/19] app/testpmd: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 12/19] test: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 13/19] common/idpf: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 14/19] net/i40e: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 15/19] net/ice: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 16/19] net/ixgbe: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 17/19] common/mlx5: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 18/19] net/mlx5: " Tyler Retzlaff
2024-04-18 20:02 ` [PATCH v2 19/19] build: enable vla warnings on " Tyler Retzlaff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1713470562-17415-5-git-send-email-roretzla@linux.microsoft.com \
--to=roretzla@linux.microsoft.com \
--cc=aman.deep.singh@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=dsosnowski@nvidia.com \
--cc=fanzhang.oss@gmail.com \
--cc=fengchengwen@huawei.com \
--cc=ferruh.yigit@amd.com \
--cc=gakhil@marvell.com \
--cc=harry.van.haaren@intel.com \
--cc=hkalra@marvell.com \
--cc=honnappa.nagarahalli@arm.com \
--cc=hujiayu.hu@foxmail.com \
--cc=jingjing.wu@intel.com \
--cc=kevin.laatz@intel.com \
--cc=konstantin.ananyev@huawei.com \
--cc=konstantin.v.ananyev@yandex.ru \
--cc=matan@nvidia.com \
--cc=mb@smartsharesystems.com \
--cc=orika@nvidia.com \
--cc=pallavi.kadam@intel.com \
--cc=reshma.pattan@intel.com \
--cc=sameh.gobriel@intel.com \
--cc=suanmingm@nvidia.com \
--cc=thomas@monjalon.net \
--cc=vfialko@marvell.com \
--cc=viacheslavo@nvidia.com \
--cc=vladimir.medvedkin@intel.com \
--cc=yipeng1.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).