From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 071A41B8F7 for ; Thu, 10 Jan 2019 16:39:59 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2019 07:39:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,461,1539673200"; d="scan'208";a="309300666" Received: from unknown (HELO saesrv02-S2600CWR.intel.com) ([10.224.122.203]) by fmsmga006.fm.intel.com with ESMTP; 10 Jan 2019 07:39:56 -0800 From: Vipin Varghese To: dev@dpdk.org, thomas@monjalon.net, john.mcnamara@intel.com Cc: konstantin.ananyev@intel.com, stephen@networkplumber.org, reshma.pattan@intel.com, jasvinder.singh@intel.com, stephen1.byrne@intel.com, amol.patel@intel.com, Vipin Varghese Date: Fri, 11 Jan 2019 03:06:40 +0530 Message-Id: <20190110213645.29901-2-vipin.varghese@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110213645.29901-1-vipin.varghese@intel.com> References: <20190107153829.34047-2-vipin.varghese@intel.com> <20190110213645.29901-1-vipin.varghese@intel.com> Subject: [dpdk-dev] [PATCH v9 1/6] app/procinfo: add support for show port 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: , X-List-Received-Date: Thu, 10 Jan 2019 15:40:00 -0000 Function show_port is used for displaying the port PMD information under primary process. The information shows basic, per queue and security. Also helper MACRO 'MAX_STRING_LEN, STATS_BDR_FMT and STATS_BDR_STR' and meson build file is updated for new functionality. Signed-off-by: Vipin Varghese Acked-by: Reshma Pattan Acked-by: John McNamara --- app/proc-info/main.c | 119 ++++++++++++++++++++++++++++++++- app/proc-info/meson.build | 2 +- doc/guides/tools/proc_info.rst | 9 ++- 3 files changed, 126 insertions(+), 4 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index c20effa4f..2108c24b0 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -29,6 +29,9 @@ #include #include #include +#include +#include +#include /* Maximum long option length for option parsing. */ #define MAX_LONG_OPT_SZ 64 @@ -36,6 +39,10 @@ #define MAX_STRING_LEN 256 +#define STATS_BDR_FMT "========================================" +#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \ + STATS_BDR_FMT, s, w, STATS_BDR_FMT) + /**< mask of enabled ports */ static uint32_t enabled_port_mask; /**< Enable stats. */ @@ -65,6 +72,12 @@ static char *xstats_name; static uint32_t nb_xstats_ids; static uint64_t xstats_ids[MAX_NB_XSTATS_IDS]; +/* show border */ +static char bdr_str[MAX_STRING_LEN]; + +/**< Enable show port. */ +static uint32_t enable_shw_port; + /**< display usage */ static void proc_info_usage(const char *prgname) @@ -83,7 +96,8 @@ proc_info_usage(const char *prgname) " --stats-reset: to reset port statistics\n" " --xstats-reset: to reset port extended statistics\n" " --collectd-format: to print statistics to STDOUT in expected by collectd format\n" - " --host-id STRING: host id used to identify the system process is running on\n", + " --host-id STRING: host id used to identify the system process is running on\n" + " --show-port: to display ports information\n", prgname); } @@ -190,6 +204,7 @@ proc_info_parse_args(int argc, char **argv) {"collectd-format", 0, NULL, 0}, {"xstats-ids", 1, NULL, 1}, {"host-id", 0, NULL, 0}, + {"show-port", 0, NULL, 0}, {NULL, 0, 0, 0} }; @@ -233,6 +248,9 @@ proc_info_parse_args(int argc, char **argv) else if (!strncmp(long_option[option_index].name, "xstats-reset", MAX_LONG_OPT_SZ)) reset_xstats = 1; + else if (!strncmp(long_option[option_index].name, + "show-port", MAX_LONG_OPT_SZ)) + enable_shw_port = 1; break; case 1: /* Print xstat single value given by name*/ @@ -584,6 +602,98 @@ metrics_display(int port_id) rte_free(names); } +static void +show_port(void) +{ + uint16_t i = 0; + int ret = 0, j, k; + + snprintf(bdr_str, MAX_STRING_LEN, " show - Port PMD %"PRIu64, + rte_get_tsc_hz()); + STATS_BDR_STR(10, bdr_str); + + RTE_ETH_FOREACH_DEV(i) { + uint16_t mtu = 0; + struct rte_eth_link link; + struct rte_eth_dev_info dev_info; + struct rte_eth_rxq_info queue_info; + struct rte_eth_rss_conf rss_conf; + + memset(&rss_conf, 0, sizeof(rss_conf)); + + snprintf(bdr_str, MAX_STRING_LEN, " Port (%u)", i); + STATS_BDR_STR(5, bdr_str); + printf(" - generic config\n"); + + printf("\t -- Socket %d\n", rte_eth_dev_socket_id(i)); + rte_eth_link_get(i, &link); + printf("\t -- link speed %d duplex %d," + " auto neg %d status %d\n", + link.link_speed, + link.link_duplex, + link.link_autoneg, + link.link_status); + printf("\t -- promiscuous (%d)\n", + rte_eth_promiscuous_get(i)); + ret = rte_eth_dev_get_mtu(i, &mtu); + if (ret == 0) + printf("\t -- mtu (%d)\n", mtu); + + rte_eth_dev_info_get(i, &dev_info); + + printf(" - queue\n"); + for (j = 0; j < dev_info.nb_rx_queues; j++) { + ret = rte_eth_rx_queue_info_get(i, j, &queue_info); + if (ret == 0) { + printf("\t -- queue %d rx scatter %d" + " descriptors %d" + " offloads 0x%"PRIx64 + " mempool socket %d\n", + j, + queue_info.scattered_rx, + queue_info.nb_desc, + queue_info.conf.offloads, + queue_info.mp->socket_id); + } + } + + ret = rte_eth_dev_rss_hash_conf_get(i, &rss_conf); + if (ret == 0) { + if (rss_conf.rss_key) { + printf(" - RSS\n"); + printf("\t -- RSS len %u key (hex):", + rss_conf.rss_key_len); + for (k = 0; k < rss_conf.rss_key_len; k++) + printf(" %x", rss_conf.rss_key[k]); + printf("\t -- hf 0x%"PRIx64"\n", + rss_conf.rss_hf); + } + } + + printf(" - cyrpto context\n"); + void *p_ctx = rte_eth_dev_get_sec_ctx(i); + printf("\t -- security context - %p\n", p_ctx); + + if (p_ctx) { + printf("\t -- size %u\n", + rte_security_session_get_size(p_ctx)); + const struct rte_security_capability *s_cap = + rte_security_capabilities_get(p_ctx); + if (s_cap) { + printf("\t -- action (0x%x), protocol (0x%x)," + " offload flags (0x%x)\n", + s_cap->action, + s_cap->protocol, + s_cap->ol_flags); + printf("\t -- capabilities - oper type %x\n", + s_cap->crypto_capabilities->op); + } + } + } + + STATS_BDR_STR(50, ""); +} + int main(int argc, char **argv) { @@ -664,9 +774,16 @@ main(int argc, char **argv) if (enable_metrics) metrics_display(RTE_METRICS_GLOBAL); + /* show information for PMD */ + if (enable_shw_port) + show_port(); + ret = rte_eal_cleanup(); if (ret) printf("Error from rte_eal_cleanup(), %d\n", ret); + snprintf(bdr_str, MAX_STRING_LEN, " "); + STATS_BDR_STR(50, bdr_str); + return 0; } diff --git a/app/proc-info/meson.build b/app/proc-info/meson.build index a52b2ee4a..866b390d6 100644 --- a/app/proc-info/meson.build +++ b/app/proc-info/meson.build @@ -3,4 +3,4 @@ sources = files('main.c') allow_experimental_apis = true -deps += ['ethdev', 'metrics'] +deps += ['ethdev', 'metrics', 'security'] diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index d5b5ed6a6..6baa1db9a 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -6,7 +6,8 @@ dpdk-procinfo Application The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application that runs as a DPDK secondary process and is capable of retrieving port -statistics, resetting port statistics and printing DPDK memory information. +statistics, resetting port statistics, printing DPDK memory information and +displaying debug information for port. This application extends the original functionality that was supported by dump_cfg. @@ -17,7 +18,7 @@ The application has a number of command line options: .. code-block:: console ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | - --stats-reset | --xstats-reset] + --stats-reset | --xstats-reset] [ --show-port ] Parameters ~~~~~~~~~~ @@ -41,6 +42,10 @@ If no port mask is specified xstats are reset for all DPDK ports. **-m**: Print DPDK memory information. +**--show-port** +The show-port parameter displays port level various configuration informationi +associated to RX port queue pair. + Limitations ----------- -- 2.17.1