A new vDPA driver feature was added to query the virtq statistics from the HW.
Use this feature to show the HW queues statistics for the virtqs. Command description: stats X Y. X is the device ID. Y is the queue ID, Y=0xffff to show all the virtio queues statistics of the device X. Signed-off-by: Matan Azrad <ma...@mellanox.com> Acked-by: Viacheslav Ovsiienko <viachesl...@mellanox.com> --- doc/guides/sample_app_ug/vdpa.rst | 3 +- examples/vdpa/main.c | 78 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/doc/guides/sample_app_ug/vdpa.rst b/doc/guides/sample_app_ug/vdpa.rst index 745f196..d66a724 100644 --- a/doc/guides/sample_app_ug/vdpa.rst +++ b/doc/guides/sample_app_ug/vdpa.rst @@ -44,7 +44,8 @@ where 1. help: show help message 2. list: list all available vdpa devices 3. create: create a new vdpa port with socket file and vdpa device address - 4. quit: unregister vhost driver and exit the application + 4. stats: show statistics of virtio queues + 5. quit: unregister vhost driver and exit the application Take IFCVF driver for example: diff --git a/examples/vdpa/main.c b/examples/vdpa/main.c index d2e2cb7..1b8a9fd 100644 --- a/examples/vdpa/main.c +++ b/examples/vdpa/main.c @@ -18,6 +18,7 @@ #include <cmdline_parse.h> #include <cmdline_socket.h> #include <cmdline_parse_string.h> +#include <cmdline_parse_num.h> #include <cmdline.h> #define MAX_PATH_LEN 128 @@ -240,6 +241,7 @@ static void cmd_help_parsed(__attribute__((unused)) void *parsed_result, " help : Show interactive instructions.\n" " list : list all available vdpa devices.\n" " create <socket file> <vdev addr> : create a new vdpa port.\n" + " stats <device ID> <virtio queue ID> : show statistics of virtio queue, 0xffff for all.\n" " quit : exit vdpa sample app.\n" ); } @@ -363,6 +365,81 @@ static void cmd_create_vdpa_port_parsed(void *parsed_result, }, }; +/* *** STATS *** */ +struct cmd_stats_result { + cmdline_fixed_string_t stats; + uint16_t did; + uint16_t qid; +}; + +static void cmd_device_stats_parsed(void *parsed_result, struct cmdline *cl, + __attribute__((unused)) void *data) +{ + struct cmd_stats_result *res = parsed_result; + struct rte_vdpa_device *vdev = rte_vdpa_get_device(res->did); + struct rte_vdpa_queue_stats stats; + uint32_t first, last; + + if (!vdev) { + RTE_LOG(ERR, VDPA, "Invalid device id %" PRIu16 ".\n", + res->did); + return; + } + if (res->qid == 0xFFFF) { + first = 0; + last = rte_vhost_get_vring_num(vports[res->did].vid); + if (last == 0) { + RTE_LOG(ERR, VDPA, "Failed to get num of actual virtqs" + " for device id %d.\n", (int)res->did); + return; + } + last--; + } else { + first = res->qid; + last = res->qid; + } + cmdline_printf(cl, "\nDevice %d:\n", (int)res->did); + for (; first <= last; first++) { + memset(&stats, 0, sizeof(stats)); + if (rte_vdpa_get_stats((int)res->did, (int)first, &stats)) { + RTE_LOG(ERR, VDPA, "Failed to get vdpa queue statistics" + " for device id %d qid %d.\n", (int)res->did, + (int)first); + return; + } + cmdline_printf(cl, "\tVirtq %" PRIu32 + ":\n\t\tReceived descriptors: %16" PRIu64 + "\t\tCompleted desccriptors: %16" PRIu64 + "\n\t\tBad descriptors: %16" PRIu32 + "\t\tExceed max chain: %16" PRIu32 + "\n\t\tInvalid_buffers: %16" PRIu32 + "\t\tErrors: %16" PRIu32 + "\n", first, stats.received_desc, + stats.completed_desc, stats.bad_desc, + stats.exceed_max_chain, stats.invalid_buffer, + stats.errors); + } +} + +cmdline_parse_token_string_t cmd_device_stats_ = + TOKEN_STRING_INITIALIZER(struct cmd_stats_result, stats, "stats"); +cmdline_parse_token_num_t cmd_device_id = + TOKEN_NUM_INITIALIZER(struct cmd_stats_result, did, UINT32); +cmdline_parse_token_num_t cmd_queue_id = + TOKEN_NUM_INITIALIZER(struct cmd_stats_result, qid, UINT32); + +cmdline_parse_inst_t cmd_device_stats = { + .f = cmd_device_stats_parsed, + .data = NULL, + .help_str = "stats: show device statistics", + .tokens = { + (void *)&cmd_device_stats_, + (void *)&cmd_device_id, + (void *)&cmd_queue_id, + NULL, + }, +}; + /* *** QUIT *** */ struct cmd_quit_result { cmdline_fixed_string_t quit; @@ -392,6 +469,7 @@ static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, (cmdline_parse_inst_t *)&cmd_help, (cmdline_parse_inst_t *)&cmd_list_vdpa_devices, (cmdline_parse_inst_t *)&cmd_create_vdpa_port, + (cmdline_parse_inst_t *)&cmd_device_stats, (cmdline_parse_inst_t *)&cmd_quit, NULL, }; -- 1.8.3.1