> -----Original Message-----
> From: Sevincer, Abdullah <abdullah.sevincer@intel.com>
The code looks better now, however if you can make below changes that would be great.
> +
> +struct eventdev_params {
> + uint32_t show_eventdev;
Can't we get rid of the "show_eventdev", and just rely below flags
<snip>
> + uint8_t num_queues;
> + uint8_t num_ports;
> + uint32_t shw_all_queues;
> + uint32_t shw_all_ports;
> + uint32_t dump_xstats;
> + uint32_t reset_xstats;
> + uint32_t shw_device_xstats;
> +parse_eventdev_dump_xstats_params(char *list) {
<snip>
> +
> + if (!eventdev_var[evdev_id].show_eventdev)
> + eventdev_var[evdev_id].show_eventdev = 1;
You can set the " eventdev_var[evdev_id].show_eventdev = 1;" without the if check. Here and in other places.
However , you don't need to have show_eventdev=1. You can think of getting rid of the "show_eventdev" altogether. Here and other places.
<snip>
> +parse_eventdev_port_xstats_params(char *list) {
> + uint8_t port_id;
> + uint8_t evdev_id;
> + if (sscanf(list, "*:%hhu", &evdev_id) == 1) {
> + if (evdev_id >= RTE_EVENT_MAX_DEVS) {
> + printf("Invalid eventdev id, id should be between 0 -
> %d\n",
Do you need to validate the port id and queue ids here and in below functions.
<snip>
> +xstats_display(uint8_t dev_id,
> + enum rte_event_dev_xstats_mode mode,
> + uint8_t queue_port_id)
> +{
> + int ret;
> + struct rte_event_dev_xstats_name *xstats_names;
> + uint64_t *ids;
> + uint64_t *values;
> + unsigned int size;
> + int i;
> +
> + size = xstats_get_names_and_ids_size(dev_id, mode, queue_port_id);
> +
> + if (size == 0) {
> + printf(
> + "No stats available for this item, mode=%d,
> queue_port_id=%d\n",
> + mode, queue_port_id);
> + return;
> + }
> +
> + /* Get memory to hold stat names, IDs, and values */
> + xstats_names = malloc(sizeof(struct rte_event_dev_xstats_name) *
> size);
> + ids = malloc(sizeof(unsigned int) * size);
> +
> + if (!xstats_names || !ids)
> + rte_panic("unable to alloc memory for stats retrieval\n");
> +
> + ret = rte_event_dev_xstats_names_get(dev_id, mode, queue_port_id,
> + xstats_names, ids,
> + size);
You need size in unsigned int form only to pass to the function rte_event_dev_xstats_names_get() , so why not use unsigned int(size) here and remove
the cast of size in function xstats_get_names_and_ids_size().
I also feel you don't need xstats_get_names_and_ids_size(), just call rte_event_dev_xstats_names_get() directly in this function , to get the size in int, use int size everywhere else,
and use it with cast while passing to rte_event_dev_xstats_names_get() again. It makes easy to follow the code .
This way You no need to do (int)size in below code too.
> + if (ret != (int)size)
> + rte_panic("rte_event_dev_xstats_names_get err %d\n", ret);
<snip>
> +
> +A typical command line usage for eventdev stats:
> +
> + .. code-block:: console
> +
> + ./dpdk-proc-info -- --show-edev-port-xstats=1:0
If you want to provide the command examples, you can give example under each command section, else you can remove this as well.
@@ -40,6 +40,7 @@
#include <rte_tm.h>
#include <rte_hexdump.h>
#include <rte_version.h>
+#include <rte_eventdev.h>
/* Maximum long option length for option parsing. */
#define MAX_LONG_OPT_SZ 64
@@ -121,6 +122,26 @@ static uint32_t enable_shw_module_eeprom;
static uint32_t enable_shw_rx_desc_dump;
static uint32_t enable_shw_tx_desc_dump;
+/* Note: Port_queue_id in xstats APIs is 8 bits, so we have a maximum of
+ * 256 ports and queues for event_Dev
+ */
+#define MAX_PORTS_QUEUES 256
+
+struct eventdev_params {
+ uint32_t show_eventdev;
+ uint8_t ports[MAX_PORTS_QUEUES];
+ uint8_t queues[MAX_PORTS_QUEUES];
+ uint8_t num_queues;
+ uint8_t num_ports;
+ uint32_t shw_all_queues;
+ uint32_t shw_all_ports;
+ uint32_t dump_xstats;
+ uint32_t reset_xstats;
+ uint32_t shw_device_xstats;
+};
+
+static struct eventdev_params eventdev_var[RTE_EVENT_MAX_DEVS];
+
#define DESC_PARAM_NUM 3
struct desc_param {
@@ -172,7 +193,12 @@ proc_info_usage(const char *prgname)
"offset: The offset of the descriptor starting from tail. "
"num: The number of the descriptors to dump.\n"
" --iter-mempool=name: iterate mempool elements to display content\n"
- " --dump-regs=file-prefix: dump registers to file with the file-prefix\n",
+ " --dump-regs=file-prefix: dump registers to file with the file-prefix\n"
+ " --show-edev-queue-xstats=queue_num:evdev_id or *:evdev_id to get queue xstats for specified queue or all queues;\n"
+ " --show-edev-port-xstats=port_num:evdev_id or *:evdev_id to get queue xstats for specified port or all ports;\n"
+ " --edev-dump-xstats=evdev_id to dump all event_dev xstats for specified eventdev device;\n"
+ " --edev-reset-xstats=evdev_id to reset event_dev xstats after reading;\n"
+ " --show-edev-device-xstats=evdev_id to get event_dev device xstats for specified eventdev device;\n",
prgname);
}
@@ -236,6 +262,123 @@ parse_descriptor_param(char *list, struct desc_param *desc)
return 0;
}
+static int
+parse_eventdev_dump_xstats_params(char *list)
+{
+ uint8_t evdev_id;
+ evdev_id = (uint8_t)atoi(list);
+
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n", RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+
+ eventdev_var[evdev_id].dump_xstats = 1;
+
+ if (!eventdev_var[evdev_id].show_eventdev)
+ eventdev_var[evdev_id].show_eventdev = 1;
+
+ return 0;
+}
+
+static int
+parse_eventdev_reset_xstats_params(char *list)
+{
+ uint8_t evdev_id;
+ evdev_id = (uint8_t)atoi(list);
+
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n", RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+
+ eventdev_var[evdev_id].reset_xstats = 1;
+
+ if (!eventdev_var[evdev_id].show_eventdev)
+ eventdev_var[evdev_id].show_eventdev = 1;
+
+ return 0;
+}
+
+static int
+parse_eventdev_device_xstats_params(char *list)
+{
+ uint8_t evdev_id;
+ evdev_id = (uint8_t)atoi(list);
+
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n", RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+
+ eventdev_var[evdev_id].shw_device_xstats = 1;
+
+ if (!eventdev_var[evdev_id].show_eventdev)
+ eventdev_var[evdev_id].show_eventdev = 1;
+
+ return 0;
+}
+
+static int
+parse_eventdev_queue_xstats_params(char *list)
+{
+ uint8_t queue_id;
+ uint8_t evdev_id;
+ if (sscanf(list, "*:%hhu", &evdev_id) == 1) {
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n",
+ RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+ eventdev_var[evdev_id].shw_all_queues = 1;
+ } else if (sscanf(list, "%hhu:%hhu", &queue_id, &evdev_id) == 2) {
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n",
+ RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+ eventdev_var[evdev_id].queues[eventdev_var[evdev_id].num_queues] = queue_id;
+ eventdev_var[evdev_id].num_queues++;
+ } else {
+ return -EINVAL;
+ }
+
+ if (!eventdev_var[evdev_id].show_eventdev)
+ eventdev_var[evdev_id].show_eventdev = 1;
+
+ return 0;
+}
+
+static int
+parse_eventdev_port_xstats_params(char *list)
+{
+ uint8_t port_id;
+ uint8_t evdev_id;
+ if (sscanf(list, "*:%hhu", &evdev_id) == 1) {
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n",
+ RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+ eventdev_var[evdev_id].shw_all_ports = 1;
+ } else if (sscanf(list, "%hhu:%hhu", &port_id, &evdev_id) == 2) {
+ if (evdev_id >= RTE_EVENT_MAX_DEVS) {
+ printf("Invalid eventdev id, id should be between 0 - %d\n",
+ RTE_EVENT_MAX_DEVS-1);
+ return -EINVAL;
+ }
+ eventdev_var[evdev_id].ports[eventdev_var[evdev_id].num_ports] = port_id;
+ eventdev_var[evdev_id].num_ports++;
+ } else {
+ return -EINVAL;
+ }
+
+ if (!eventdev_var[evdev_id].show_eventdev)
+ eventdev_var[evdev_id].show_eventdev = 1;
+
+ return 0;
+}
+
static int
proc_info_preparse_args(int argc, char **argv)
{
@@ -302,6 +445,11 @@ proc_info_parse_args(int argc, char **argv)
{"show-module-eeprom", 0, NULL, 0},
{"show-rx-descriptor", required_argument, NULL, 1},
{"show-tx-descriptor", required_argument, NULL, 1},
+ {"show-edev-queue-xstats", required_argument, NULL, 0},
+ {"show-edev-port-xstats", required_argument, NULL, 0},
+ {"edev-dump-xstats", required_argument, NULL, 0},
+ {"edev-reset-xstats", required_argument, NULL, 0},
+ {"show-edev-device-xstats", required_argument, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -385,6 +533,47 @@ proc_info_parse_args(int argc, char **argv)
else if (!strncmp(long_option[option_index].name,
"show-module-eeprom", MAX_LONG_OPT_SZ))
enable_shw_module_eeprom = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "edev-dump-xstats", MAX_LONG_OPT_SZ)) {
+ int ret = parse_eventdev_dump_xstats_params(optarg);
+ if (ret < 0) {
+ fprintf(stderr, "Error parsing eventdev dump xstats params: %s\n",
+ strerror(-ret));
+ return -1;
+ }
+ } else if (!strncmp(long_option[option_index].name,
+ "edev-reset-xstats", MAX_LONG_OPT_SZ)) {
+ int ret = parse_eventdev_reset_xstats_params(optarg);
+ if (ret < 0) {
+ fprintf(stderr, "Error parsing eventdev reset xstats params: %s\n",
+ strerror(-ret));
+ return -1;
+ }
+ } else if (!strncmp(long_option[option_index].name,
+ "show-edev-device-xstats", MAX_LONG_OPT_SZ)) {
+ int ret = parse_eventdev_device_xstats_params(optarg);
+ if (ret < 0) {
+ fprintf(stderr, "Error parsing eventdev reset xstats params: %s\n",
+ strerror(-ret));
+ return -1;
+ }
+ } else if (!strncmp(long_option[option_index].name,
+ "show-edev-queue-xstats", MAX_LONG_OPT_SZ)) {
+ int ret = parse_eventdev_queue_xstats_params(optarg);
+ if (ret < 0) {
+ fprintf(stderr, "Error parsing eventdev queue xstats params: %s\n",
+ strerror(-ret));
+ return -1;
+ }
+ } else if (!strncmp(long_option[option_index].name,
+ "show-edev-port-xstats", MAX_LONG_OPT_SZ)) {
+ int ret = parse_eventdev_port_xstats_params(optarg);
+ if (ret < 0) {
+ fprintf(stderr, "Error parsing eventdev port xstats params: %s\n",
+ strerror(-ret));
+ return -1;
+ }
+ }
break;
case 1:
/* Print xstat single value given by name*/
@@ -1744,6 +1933,198 @@ nic_tx_descriptor_display(uint16_t port_id, struct desc_param *desc)
strerror(-ret));
}
+static unsigned int
+xstats_get_names_and_ids_size(uint8_t dev_id,
+ enum rte_event_dev_xstats_mode mode,
+ uint8_t queue_port_id)
+{
+
+ int ret;
+
+ /* Get amount of storage required */
+ ret = rte_event_dev_xstats_names_get(dev_id,
+ mode,
+ queue_port_id,
+ NULL, /* names */
+ NULL, /* ids */
+ 0); /* num */
+
+ if (ret < 0)
+ rte_panic("rte_event_dev_xstats_names_get err %d\n", ret);
+
+ return (unsigned int)ret;
+
+}
+
+static void
+xstats_display(uint8_t dev_id,
+ enum rte_event_dev_xstats_mode mode,
+ uint8_t queue_port_id)
+{
+ int ret;
+ struct rte_event_dev_xstats_name *xstats_names;
+ uint64_t *ids;
+ uint64_t *values;
+ unsigned int size;
+ int i;
+
+ size = xstats_get_names_and_ids_size(dev_id, mode, queue_port_id);
+
+ if (size == 0) {
+ printf(
+ "No stats available for this item, mode=%d, queue_port_id=%d\n",
+ mode, queue_port_id);
+ return;
+ }
+
+ /* Get memory to hold stat names, IDs, and values */
+ xstats_names = malloc(sizeof(struct rte_event_dev_xstats_name) * size);
+ ids = malloc(sizeof(unsigned int) * size);
+
+ if (!xstats_names || !ids)
+ rte_panic("unable to alloc memory for stats retrieval\n");
+
+ ret = rte_event_dev_xstats_names_get(dev_id, mode, queue_port_id,
+ xstats_names, ids,
+ size);
+ if (ret != (int)size)
+ rte_panic("rte_event_dev_xstats_names_get err %d\n", ret);
+
+ values = malloc(sizeof(uint64_t) * size);
+ if (!values)
+ rte_panic("unable to alloc memory for stats retrieval\n");
+
+ ret = rte_event_dev_xstats_get(dev_id, mode, queue_port_id,
+ ids, values, size);
+
+ if (ret != (int)size)
+ rte_panic("rte_event_dev_xstats_get err %d\n", ret);
+
+ for (i = 0; i < (int)size; i++) {
+ printf("id %"PRIu64" %s = %"PRIu64"\n",
+ ids[i], &xstats_names[i].name[0], values[i]);
+ }
+
+ free(values);
+ free(xstats_names);
+ free(ids);
+
+}
+
+static void
+xstats_reset(uint8_t dev_id,
+ enum rte_event_dev_xstats_mode mode,
+ uint8_t queue_port_id)
+{
+ int ret;
+ struct rte_event_dev_xstats_name *xstats_names;
+ uint64_t *ids;
+ unsigned int size;
+
+ size = xstats_get_names_and_ids_size(dev_id, mode, queue_port_id);
+
+ if (size == 0) {
+ printf(
+ "No stats available for this item, mode=%d, queue_port_id=%d\n",
+ mode, queue_port_id);
+ return;
+ }
+
+ /* Get memory to hold stat names, IDs, and values */
+ xstats_names = malloc(sizeof(struct rte_event_dev_xstats_name) * size);
+ ids = malloc(sizeof(unsigned int) * size);
+
+ if (!xstats_names || !ids)
+ rte_panic("unable to alloc memory for stats retrieval\n");
+
+ ret = rte_event_dev_xstats_names_get(dev_id, mode, queue_port_id,
+ xstats_names, ids,
+ size);
+ if (ret != (int)size)
+ rte_panic("rte_event_dev_xstats_names_get err %d\n", ret);
+
+ rte_event_dev_xstats_reset(dev_id, mode, queue_port_id,
+ ids, size);
+
+ free(xstats_names);
+ free(ids);
+
+}
+
+static int
+process_eventdev_xstats(void)
+{
+ int i;
+ int j;
+ int processing_eventdev_xstats = 0;
+
+ for (i = 0; i < RTE_EVENT_MAX_DEVS; i++) {
+ if (eventdev_var[i].show_eventdev == 1) {
+
+ if (!processing_eventdev_xstats)
+ processing_eventdev_xstats = 1;
+
+ if (i >= rte_event_dev_count())
+ rte_panic("invalid event device %d\n", i);
+
+ if (eventdev_var[i].dump_xstats) {
+ int ret = rte_event_dev_dump(i, stdout);
+ if (ret)
+ rte_panic("dump failed with err=%d\n", ret);
+ }
+
+ if (eventdev_var[i].shw_device_xstats == 1) {
+ xstats_display(i, RTE_EVENT_DEV_XSTATS_DEVICE, 0);
+
+ if (eventdev_var[i].reset_xstats == 1)
+ xstats_reset(i, RTE_EVENT_DEV_XSTATS_DEVICE, 0);
+ }
+
+ if (eventdev_var[i].shw_all_ports == 1) {
+ for (j = 0; j < MAX_PORTS_QUEUES; j++) {
+ xstats_display(i, RTE_EVENT_DEV_XSTATS_PORT, j);
+
+ if (eventdev_var[i].reset_xstats == 1)
+ xstats_reset(i, RTE_EVENT_DEV_XSTATS_PORT, j);
+ }
+ } else {
+ for (j = 0; j < eventdev_var[i].num_ports; j++) {
+ xstats_display(i, RTE_EVENT_DEV_XSTATS_PORT,
+ eventdev_var[i].ports[j]);
+
+ if (eventdev_var[i].reset_xstats == 1)
+ xstats_reset(i, RTE_EVENT_DEV_XSTATS_PORT,
+ eventdev_var[i].ports[j]);
+ }
+ }
+
+ if (eventdev_var[i].shw_all_queues == 1) {
+ for (j = 0; j < MAX_PORTS_QUEUES; j++) {
+ xstats_display(i, RTE_EVENT_DEV_XSTATS_QUEUE, j);
+
+ if (eventdev_var[i].reset_xstats == 1)
+ xstats_reset(i, RTE_EVENT_DEV_XSTATS_QUEUE, j);
+ }
+ } else {
+ for (j = 0; j < eventdev_var[i].num_queues; j++) {
+ xstats_display(i, RTE_EVENT_DEV_XSTATS_QUEUE,
+ eventdev_var[i].queues[j]);
+
+ if (eventdev_var[i].reset_xstats == 1)
+ xstats_reset(i, RTE_EVENT_DEV_XSTATS_QUEUE,
+ eventdev_var[i].queues[j]);
+ }
+ }
+
+ }
+ }
+
+ if (processing_eventdev_xstats)
+ return 1;
+
+ return 0;
+}
+
int
main(int argc, char **argv)
{
@@ -1794,6 +2175,9 @@ main(int argc, char **argv)
return 0;
}
+ if (process_eventdev_xstats())
+ return 0;
+
nb_ports = rte_eth_dev_count_avail();
if (nb_ports == 0)
rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
@@ -8,7 +8,7 @@ if is_windows
endif
sources = files('main.c')
-deps += ['ethdev', 'security']
+deps += ['ethdev', 'security', 'eventdev']
if dpdk_conf.has('RTE_LIB_METRICS')
deps += 'metrics'
endif
@@ -22,7 +22,9 @@ The application has a number of command line options:
--show-ring[=name] | --show-mempool[=name] | --iter-mempool=name |
--show-port-private | --version | --firmware-version | --show-rss-reta |
--show-module-eeprom | --show-rx-descriptor queue_id:offset:num |
- --show-tx-descriptor queue_id:offset:num ]
+ --show-tx-descriptor queue_id:offset:num | --show-edev-queue-xstats=queue_num:evdev_id |
+ --show-edev-port-xstats=port_num :evdev_id | --edev-dump-xstats=evdev_id |
+ --edev-reset-xstats=evdev_id | --show-edev-device-xstats=evdev_id]
Parameters
~~~~~~~~~~
@@ -101,6 +103,34 @@ queue_id: A Tx queue identifier on this port.
offset: The offset of the descriptor starting from tail.
num: The number of the descriptors to dump.
+**--show-edev-queue-xstats queue_num:evdev_id**
+The show-edev-queue-xstats parameter enables stats for specified queue or all queues.
+queue_num: The queue number to get queue xstats for this specified queue or * for all queues.
+evdev_id: Id of the eventdev device to display xstats.
+
+**--show-edev-port-xstats port_num:evdev_id**
+The show-edev-port-xstats parameter enables stats for specified port or all ports.
+port_num: The port number to get port xstats for this specified port or * for all ports.
+evdev_id: Id of the eventdev device to display xstats.
+
+**--edev-dump-xstats evdev_id**
+The edev-dump-xstats parameter dumps all eventdev stats.
+evdev_id: Id of the eventdev device to display xstats.
+
+**--edev-reset-xstats evdev_id**
+The edev-reset-xstats parameter resets eventdev xstats after reading.
+evdev_id: Id of the eventdev device to display xstats.
+
+**--show-edev-device-xstats evdev_id**
+The show-edev-device-xstats parameter displays eventdev device xstats.
+evdev_id: Id of the eventdev device to display xstats.
+
+A typical command line usage for eventdev stats:
+
+ .. code-block:: console
+
+ ./dpdk-proc-info -- --show-edev-port-xstats=1:0
+
Limitations
-----------