From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D990A04F1; Thu, 18 Jun 2020 21:00:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A56931C034; Thu, 18 Jun 2020 21:00:13 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 12AE31C030 for ; Thu, 18 Jun 2020 21:00:12 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@mellanox.com) with SMTP; 18 Jun 2020 22:00:07 +0300 Received: from pegasus25.mtr.labs.mlnx. (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 05IIxoPq016515; Thu, 18 Jun 2020 22:00:07 +0300 From: Matan Azrad To: Maxime Coquelin , Xiao Wang Cc: dev@dpdk.org Date: Thu, 18 Jun 2020 18:59:44 +0000 Message-Id: <1592506784-441548-5-git-send-email-matan@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592506784-441548-1-git-send-email-matan@mellanox.com> References: <01591112869-78828-1-git-send-email-matan@mellanox.com> <1592506784-441548-1-git-send-email-matan@mellanox.com> Subject: [dpdk-dev] [PATCH v4 4/4] examples/vdpa: add statistics show command X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reviewed-by: Maxime Coquelin --- doc/guides/sample_app_ug/vdpa.rst | 3 +- examples/vdpa/main.c | 119 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 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 d9a9112..cdef715 100644 --- a/examples/vdpa/main.c +++ b/examples/vdpa/main.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #define MAX_PATH_LEN 128 @@ -29,6 +30,9 @@ struct vdpa_port { int did; int vid; uint64_t flags; + int stats_n; + struct rte_vdpa_stat_name *stats_names; + struct rte_vdpa_stat *stats; }; static struct vdpa_port vports[MAX_VDPA_SAMPLE_PORTS]; @@ -199,6 +203,10 @@ struct vdpa_port { RTE_LOG(ERR, VDPA, "Fail to unregister vhost driver for %s.\n", socket_path); + if (vport->stats_names) { + rte_free(vport->stats_names); + vport->stats_names = NULL; + } } static void @@ -240,6 +248,7 @@ static void cmd_help_parsed(__rte_unused void *parsed_result, " help : Show interactive instructions.\n" " list : list all available vdpa devices.\n" " create : create a new vdpa port.\n" + " stats : show statistics of virtio queue, 0xffff for all.\n" " quit : exit vdpa sample app.\n" ); } @@ -363,6 +372,115 @@ 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 vdpa_port *vport = NULL; + uint32_t first, last; + int i; + + if (!vdev) { + RTE_LOG(ERR, VDPA, "Invalid device id %" PRIu16 ".\n", + res->did); + return; + } + for (i = 0; i < RTE_MIN(MAX_VDPA_SAMPLE_PORTS, dev_total); i++) { + if (vports[i].did == res->did) { + vport = &vports[i]; + break; + } + } + if (!vport) { + RTE_LOG(ERR, VDPA, "Device id %" PRIu16 " was not created.\n", + res->did); + return; + } + if (res->qid == 0xFFFF) { + first = 0; + last = rte_vhost_get_vring_num(vport->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; + } + if (!vport->stats_names) { + vport->stats_n = rte_vdpa_get_stats_names(vport->did, NULL, 0); + if (vport->stats_n <= 0) { + RTE_LOG(ERR, VDPA, "Failed to get names number of " + "device %d stats.\n", (int)res->did); + return; + } + vport->stats_names = rte_zmalloc(NULL, + (sizeof(*vport->stats_names) + sizeof(*vport->stats)) * + vport->stats_n, 0); + if (!vport->stats_names) { + RTE_LOG(ERR, VDPA, "Failed to allocate memory for stat" + " names of device %d.\n", (int)res->did); + return; + } + i = rte_vdpa_get_stats_names(vport->did, vport->stats_names, + vport->stats_n); + if (vport->stats_n != i) { + RTE_LOG(ERR, VDPA, "Failed to get names of device %d " + "stats.\n", (int)res->did); + return; + } + vport->stats = (struct rte_vdpa_stat *) + (vport->stats_names + vport->stats_n); + } + cmdline_printf(cl, "\nDevice %d:\n", (int)res->did); + for (; first <= last; first++) { + memset(vport->stats, 0, sizeof(*vport->stats) * vport->stats_n); + if (rte_vdpa_get_stats(vport->did, (int)first, vport->stats, + vport->stats_n) <= 0) { + 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", first); + for (i = 0; i < vport->stats_n; ++i) { + cmdline_printf(cl, "\t\t%-*s %-16" PRIu64 "\n", + RTE_VDPA_STATS_NAME_SIZE, + vport->stats_names[vport->stats[i].id].name, + vport->stats[i].value); + } + } +} + +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 +510,7 @@ static void cmd_quit_parsed(__rte_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