From patchwork Mon Jan 7 15:38:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Varghese, Vipin" X-Patchwork-Id: 49471 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0765A1B51B; Mon, 7 Jan 2019 10:42:10 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id BEFC01B523 for ; Mon, 7 Jan 2019 10:42:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 01:42:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,450,1539673200"; d="scan'208";a="289445041" Received: from unknown (HELO saesrv02-S2600CWR.intel.com) ([10.224.122.203]) by orsmga005.jf.intel.com with ESMTP; 07 Jan 2019 01:42:05 -0800 From: Vipin Varghese To: dev@dpdk.org, thomas@monjalon.net Cc: reshma.pattan@intel.com, john.mcnamara@intel.com, amol.patel@intel.com, stephen@networkplumber.org, konstantin.ananyev@intel.com, jasvinder.singh@intel.com, Vipin Varghese Date: Mon, 7 Jan 2019 21:08:29 +0530 Message-Id: <20190107153829.34047-8-vipin.varghese@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190107153829.34047-1-vipin.varghese@intel.com> References: <20181213050842.64587-1-vipin.varghese@intel.com> <20190107153829.34047-1-vipin.varghese@intel.com> Subject: [dpdk-dev] [PATCH v8 7/7] app/procinfo: add support for iter mempool 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" Function iter_mempool is used for iterating slected mempool elements and display the contents of elements for a max of 256 bytes. In case of invalid or no name for mempool, no information is displayed. Signed-off-by: Vipin Varghese Acked-by: Reshma Pattan Acked-by: John McNamara --- app/proc-info/main.c | 48 +++++++++++++++++++++++++++++++++- doc/guides/tools/proc_info.rst | 6 ++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 4aeab926d..b9acfa9ec 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -33,6 +33,7 @@ #include #include #include +#include /* Maximum long option length for option parsing. */ #define MAX_LONG_OPT_SZ 64 @@ -88,6 +89,9 @@ static char *ring_name; /**< Enable show mempool. */ static uint32_t enable_shw_mempool; static char *mempool_name; +/**< Enable iter mempool. */ +static uint32_t enable_iter_mempool; +static char *mempool_iter_name; /**< display usage */ static void @@ -112,7 +116,8 @@ proc_info_usage(const char *prgname) " --show-tm: to display traffic manager information for ports\n" " --show-crypto: to display crypto information\n" " --show-ring[=name]: to display ring information\n" - " --show-mempool[=name]: to display mempool information\n", + " --show-mempool[=name]: to display mempool information\n" + " --iter-mempool=name: iterate mempool elements to display content\n", prgname); } @@ -224,6 +229,7 @@ proc_info_parse_args(int argc, char **argv) {"show-crypto", 0, NULL, 0}, {"show-ring", optional_argument, NULL, 0}, {"show-mempool", optional_argument, NULL, 0}, + {"iter-mempool", required_argument, NULL, 0}, {NULL, 0, 0, 0} }; @@ -284,6 +290,10 @@ proc_info_parse_args(int argc, char **argv) "show-mempool", MAX_LONG_OPT_SZ)) { enable_shw_mempool = 1; mempool_name = optarg; + } else if (!strncmp(long_option[option_index].name, + "iter-mempool", MAX_LONG_OPT_SZ)) { + enable_iter_mempool = 1; + mempool_iter_name = optarg; } break; case 1: @@ -1179,6 +1189,40 @@ show_mempool(char *name) STATS_BDR_STR(50, ""); } +static void +mempool_itr_obj(struct rte_mempool *mp, void *opaque, + void *obj, unsigned int obj_idx) +{ + printf(" - obj_idx %u opaque %p obj %p\n", + obj_idx, opaque, obj); + + if (obj) + rte_hexdump(stdout, " Obj Content", + obj, (mp->elt_size > 256)?256:mp->elt_size); +} + +static void +iter_mempool(char *name) +{ + snprintf(bdr_str, MAX_STRING_LEN, " iter - MEMPOOL %"PRIu64, + rte_get_tsc_hz()); + STATS_BDR_STR(10, bdr_str); + + if (name != NULL) { + struct rte_mempool *ptr = rte_mempool_lookup(name); + if (ptr != NULL) { + /* iterate each object */ + uint32_t ret = rte_mempool_obj_iter(ptr, + mempool_itr_obj, NULL); + printf("\n - iterated %u objects\n", ret); + STATS_BDR_STR(50, ""); + return; + } + } + + STATS_BDR_STR(50, ""); +} + int main(int argc, char **argv) { @@ -1270,6 +1314,8 @@ main(int argc, char **argv) show_ring(ring_name); if (enable_shw_mempool) show_mempool(mempool_name); + if (enable_iter_mempool) + iter_mempool(mempool_iter_name); ret = rte_eal_cleanup(); if (ret) diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 42c5d45e0..6bdf5a861 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -19,7 +19,7 @@ The application has a number of command line options: ./$(RTE_TARGET)/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | - --show-ring[=name] | --show-mempool[=name] ] + --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] Parameters ~~~~~~~~~~ @@ -65,6 +65,10 @@ The show-mempool parameter display current allocation of all mempool debug information. Specifying the name allows to display details for specific specific mempool. For invalid or no mempool name, whole list is dump. +**--iter-mempool=name** +The iter-mempool parameter iterates and displays mempool elements specified +by name. For invalid or no mempool name no elements are displayed. + Limitations -----------