From patchwork Fri Aug 20 13:55:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 97164 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F363AA0C4D; Fri, 20 Aug 2021 15:55:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 783FD4013F; Fri, 20 Aug 2021 15:55:44 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 17D6B4003E for ; Fri, 20 Aug 2021 15:55:43 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id 8D9BB7F5FD; Fri, 20 Aug 2021 16:55:42 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD autolearn=no autolearn_force=no version=3.4.2 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id 587527F4FD; Fri, 20 Aug 2021 16:55:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 587527F4FD Authentication-Results: shelob.oktetlabs.ru/587527F4FD; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: Xiaoyun Li Cc: dev@dpdk.org, David Marchand , Ivan Ilchenko Date: Fri, 20 Aug 2021 16:55:34 +0300 Message-Id: <20210820135534.3542981-1-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210723131515.2317168-12-andrew.rybchenko@oktetlabs.ru> References: <20210723131515.2317168-12-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4] app/testpmd: add option to display extended statistics X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" From: Ivan Ilchenko Add 'display-xstats' option for using in accompanying with Rx/Tx statistics (i.e. 'stats-period' option or 'show port stats' interactive command) to display specified list of extended statistics. Signed-off-by: Ivan Ilchenko Signed-off-by: Andrew Rybchenko Acked-by: Ajit Khaparde --- v4: - split from patch series - move xstats information to rte_port structure to avoid extra global structure app/test-pmd/cmdline.c | 55 +++++++++++++ app/test-pmd/config.c | 66 ++++++++++++++++ app/test-pmd/parameters.c | 14 ++++ app/test-pmd/testpmd.c | 110 ++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 23 ++++++ doc/guides/testpmd_app_ug/run_app.rst | 5 ++ 6 files changed, 273 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 82253bc751..cd538ace30 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -3621,6 +3621,61 @@ cmdline_parse_inst_t cmd_stop = { /* *** SET CORELIST and PORTLIST CONFIGURATION *** */ +int +parse_xstats_list(const char *in_str, struct rte_eth_xstat_name **xstats, + unsigned int *xstats_num) +{ + int max_names_nb, names_nb; + int stringlen; + char **names; + char *str; + int ret; + int i; + + names = NULL; + str = strdup(in_str); + if (str == NULL) { + ret = ENOMEM; + goto out; + } + stringlen = strlen(str); + + for (i = 0, max_names_nb = 1; str[i] != '\0'; i++) { + if (str[i] == ',') + max_names_nb++; + } + + names = calloc(max_names_nb, sizeof(*names)); + if (names == NULL) { + ret = ENOMEM; + goto out; + } + + names_nb = rte_strsplit(str, stringlen, names, max_names_nb, ','); + if (names_nb < 0) { + ret = EINVAL; + goto out; + } + + *xstats = calloc(names_nb, sizeof(**xstats)); + if (*xstats == NULL) { + ret = ENOMEM; + goto out; + } + + for (i = 0; i < names_nb; i++) + rte_strscpy((*xstats)[i].name, names[i], + sizeof((*xstats)[i].name)); + + *xstats_num = names_nb; + ret = 0; + +out: + free(names); + free(str); + return ret; +} + unsigned int parse_item_list(const char *str, const char *item_name, unsigned int max_items, unsigned int *parsed_items, int check_unique_values) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 31d8ba1b91..ea5b59f54f 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -173,6 +173,70 @@ print_ethaddr(const char *name, struct rte_ether_addr *eth_addr) printf("%s%s", name, buf); } +static void +nic_xstats_display_periodic(portid_t port_id) +{ + struct xstat_display_info *xstats_info; + uint64_t *prev_values, *curr_values; + uint64_t diff_value, value_rate; + uint64_t *ids, *ids_supp; + struct timespec cur_time; + unsigned int i, i_supp; + size_t ids_supp_sz; + uint64_t diff_ns; + int rc; + + xstats_info = &ports[port_id].xstats_info; + + ids_supp_sz = xstats_info->ids_supp_sz; + if (xstats_display_num == 0 || ids_supp_sz == 0) + return; + + printf("\n"); + + ids = xstats_info->ids; + ids_supp = xstats_info->ids_supp; + prev_values = xstats_info->prev_values; + curr_values = xstats_info->curr_values; + + rc = rte_eth_xstats_get_by_id(port_id, ids_supp, curr_values, + ids_supp_sz); + if (rc != (int)ids_supp_sz) { + fprintf(stderr, "%s: Failed to get values of %zu supported xstats for port %u - return code %d\n", + __func__, ids_supp_sz, port_id, rc); + return; + } + + diff_ns = 0; + if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) { + uint64_t ns; + + ns = cur_time.tv_sec * NS_PER_SEC; + ns += cur_time.tv_nsec; + + if (xstats_info->prev_ns != 0) + diff_ns = ns - xstats_info->prev_ns; + xstats_info->prev_ns = ns; + } + + printf("%-31s%-17s%s\n", " ", "Value", "Rate (since last show)"); + for (i = i_supp = 0; i < xstats_display_num; i++) { + if (ids[i] == XSTAT_ID_INVALID) + continue; + + diff_value = (curr_values[i_supp] > prev_values[i]) ? + (curr_values[i_supp] - prev_values[i]) : 0; + prev_values[i] = curr_values[i_supp]; + value_rate = diff_ns > 0 ? + (double)diff_value / diff_ns * NS_PER_SEC : 0; + + printf(" %-25s%12"PRIu64" %15"PRIu64"\n", + xstats_display[i].name, curr_values[i_supp], value_rate); + + i_supp++; + } +} + void nic_stats_display(portid_t port_id) { @@ -243,6 +307,8 @@ nic_stats_display(portid_t port_id) PRIu64" Tx-bps: %12"PRIu64"\n", mpps_rx, mbps_rx * 8, mpps_tx, mbps_tx * 8); + nic_xstats_display_periodic(port_id); + printf(" %s############################%s\n", nic_stats_border, nic_stats_border); } diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 7c13210f04..e78929795c 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -61,6 +61,9 @@ usage(char* progname) "(only if interactive is disabled).\n"); printf(" --stats-period=PERIOD: statistics will be shown " "every PERIOD seconds (only if interactive is disabled).\n"); + printf(" --display-xstats xstat1[,...]: extended statistics to show. " + "Used with --stats-period specified or interactive commands " + "that show Rx/Tx statistics (i.e. 'show port stats').\n"); printf(" --nb-cores=N: set the number of forwarding cores " "(1 <= N <= %d).\n", nb_lcores); printf(" --nb-ports=N: set the number of forwarding ports " @@ -535,6 +538,7 @@ launch_args_parse(int argc, char** argv) #endif { "tx-first", 0, 0, 0 }, { "stats-period", 1, 0, 0 }, + { "display-xstats", 1, 0, 0 }, { "nb-cores", 1, 0, 0 }, { "nb-ports", 1, 0, 0 }, { "coremask", 1, 0, 0 }, @@ -692,6 +696,16 @@ launch_args_parse(int argc, char** argv) stats_period = n; break; } + if (!strcmp(lgopts[opt_idx].name, "display-xstats")) { + char rc; + + rc = parse_xstats_list(optarg, &xstats_display, + &xstats_display_num); + if (rc != 0) + rte_exit(EXIT_FAILURE, + "Failed to fill xstats to display: %d\n", + rc); + } if (!strcmp(lgopts[opt_idx].name, "eth-peers-configfile")) { if (init_peer_eth_addrs(optarg) != 0) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 6cbe9ba3c8..69a6a6913c 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -208,6 +208,11 @@ uint32_t param_total_num_mbufs = 0; /**< number of mbufs in all pools - if * specified on command-line. */ uint16_t stats_period; /**< Period to show statistics (disabled by default) */ +/** Extended statistics to show. */ +struct rte_eth_xstat_name *xstats_display; + +unsigned int xstats_display_num; /**< Size of extended statistics to show */ + /* * In container, it cannot terminate the process which running with 'stats-period' * option. Set flag to exit stats period loop after received SIGINT/SIGTERM. @@ -542,6 +547,12 @@ uint16_t gso_max_segment_size = RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN; /* Holds the registered mbuf dynamic flags names. */ char dynf_names[64][RTE_MBUF_DYN_NAMESIZE]; +/** Fill helper structures for specified port to show extended statistics. */ +static void fill_display_xstats_info_for_port(portid_t pi); + +/** Fill helper structures for all ports to show extended statistics. */ +static void fill_display_xstats_info(void); + /* * Helper function to check if socket is already discovered. * If yes, return positive value. If not, return zero. @@ -2685,6 +2696,8 @@ start_port(portid_t pid) } } + fill_display_xstats_info_for_port(pid); + printf("Done\n"); return 0; } @@ -3719,6 +3732,40 @@ init_port_dcb_config(portid_t pid, return 0; } +static int +alloc_display_xstats_info(portid_t pi) +{ + uint64_t **ids = &ports[pi].xstats_info.ids; + uint64_t **ids_supp = &ports[pi].xstats_info.ids_supp; + uint64_t **prev_values = &ports[pi].xstats_info.prev_values; + uint64_t **curr_values = &ports[pi].xstats_info.curr_values; + + if (xstats_display_num == 0) + return 0; + + *ids = calloc(xstats_display_num, sizeof(**ids)); + if (*ids == NULL) + return -ENOMEM; + + *ids_supp = calloc(xstats_display_num, sizeof(**ids_supp)); + if (*ids_supp == NULL) + return -ENOMEM; + + *prev_values = calloc(xstats_display_num, + sizeof(**prev_values)); + if (*prev_values == NULL) + return -ENOMEM; + + *curr_values = calloc(xstats_display_num, + sizeof(**curr_values)); + if (*curr_values == NULL) + return -ENOMEM; + + ports[pi].xstats_info.allocated = true; + + return 0; +} + static void init_port(void) { @@ -3733,6 +3780,8 @@ init_port(void) "rte_zmalloc(%d struct rte_port) failed\n", RTE_MAX_ETHPORTS); } + for (i = 0; i < RTE_MAX_ETHPORTS; i++) + ports[i].xstats_info.allocated = false; for (i = 0; i < RTE_MAX_ETHPORTS; i++) LIST_INIT(&ports[i].flow_tunnel_list); /* Initialize ports NUMA structures */ @@ -3748,6 +3797,67 @@ force_quit(void) prompt_exit(); } +static void +fill_display_xstats_info_for_port(portid_t pi) +{ + unsigned int stat, stat_supp; + uint64_t *ids, *ids_supp; + const char *xstat_name; + struct rte_port *port; + int rc; + + if (xstats_display_num == 0) + return; + + if (pi == (portid_t)RTE_PORT_ALL) { + fill_display_xstats_info(); + return; + } + + port = &ports[pi]; + if (port->port_status != RTE_PORT_STARTED) + return; + + if (!port->xstats_info.allocated && alloc_display_xstats_info(pi) != 0) + rte_exit(EXIT_FAILURE, + "Failed to allocate xstats display memory\n"); + + ids = port->xstats_info.ids; + ids_supp = port->xstats_info.ids_supp; + + for (stat = stat_supp = 0; stat < xstats_display_num; stat++) { + xstat_name = xstats_display[stat].name; + + rc = rte_eth_xstats_get_id_by_name(pi, xstat_name, + ids + stat); + if (rc != 0) { + ids[stat] = XSTAT_ID_INVALID; + fprintf(stderr, "No xstat '%s' on port %u - skip it\n", + xstat_name, pi); + continue; + } + ids_supp[stat_supp++] = ids[stat]; + } + + port->xstats_info.ids_supp_sz = stat_supp; +} + +static void +fill_display_xstats_info(void) +{ + portid_t pi; + + if (xstats_display_num == 0) + return; + + RTE_ETH_FOREACH_DEV(pi) { + if (pi == (portid_t)RTE_PORT_ALL) + continue; + + fill_display_xstats_info_for_port(pi); + } +} + static void print_stats(void) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 16a3598e48..68f182944b 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -195,6 +195,19 @@ struct tunnel_ops { uint32_t items:1; }; +/** Information for an extended statistics to show. */ +struct xstat_display_info { + /** IDs of xstats in the order of xstats_display */ + uint64_t *ids; + /** Supported xstats IDs in the order of xstats_display */ + uint64_t *ids_supp; + size_t ids_supp_sz; + uint64_t *prev_values; + uint64_t *curr_values; + uint64_t prev_ns; + bool allocated; +}; + /** * The data structure associated with each port. */ @@ -234,6 +247,7 @@ struct rte_port { /**< dynamic flags. */ uint64_t mbuf_dynf; const struct rte_eth_rxtx_callback *tx_set_dynf_cb[RTE_MAX_QUEUES_PER_PORT+1]; + struct xstat_display_info xstats_info; }; /** @@ -434,6 +448,13 @@ extern uint32_t param_total_num_mbufs; extern uint16_t stats_period; +extern struct rte_eth_xstat_name *xstats_display; +extern unsigned int xstats_display_num; + +#define XSTAT_ID_INVALID UINT64_MAX + +extern struct xstat_display_info xstats_per_port[]; + extern uint16_t hairpin_mode; #ifdef RTE_LIB_LATENCYSTATS @@ -766,6 +787,8 @@ inc_tx_burst_stats(struct fwd_stream *fs, uint16_t nb_tx) unsigned int parse_item_list(const char *str, const char *item_name, unsigned int max_items, unsigned int *parsed_items, int check_unique_values); +int parse_xstats_list(const char *in_str, struct rte_eth_xstat_name **xstats, + unsigned int *xstats_num); void launch_args_parse(int argc, char** argv); void cmdline_read_from_file(const char *filename); void prompt(void); diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 6061674239..d77afeb633 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -56,6 +56,11 @@ The command line options are: Display statistics every PERIOD seconds, if interactive mode is disabled. The default value is 0, which means that the statistics will not be displayed. +* ``--display-xstats xstat1[,...]`` + + Display extended statistics every PERIOD seconds as specified in ``--stats-period`` + or when used with interactive commands that show Rx/Tx statistics (i.e. 'show port stats'). + * ``--nb-cores=N`` Set the number of forwarding cores,