From patchwork Fri May 27 02:33:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 111934 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru 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 46495A055C; Fri, 27 May 2022 04:35:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59CE34282A; Fri, 27 May 2022 04:35:16 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 4B54642826 for ; Fri, 27 May 2022 04:35:13 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4L8TPv0k0xz1JCQV for ; Fri, 27 May 2022 10:33:39 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 27 May 2022 10:35:11 +0800 From: "Min Hu (Connor)" To: CC: "Min Hu (Connor)" , Maryam Tahhan , Reshma Pattan Subject: [PATCH 4/4] app/procinfo: support descriptor dump Date: Fri, 27 May 2022 10:33:51 +0800 Message-ID: <20220527023351.40577-5-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527023351.40577-1-humin29@huawei.com> References: <20220527023351.40577-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected 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 This patch support HW Rx/Tx descriptor dump The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- --show-rx-descriptor queue_id:descriptor_id dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- --show-tx-descriptor queue_id:descriptor_id Signed-off-by: Min Hu (Connor) --- app/proc-info/main.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index b7e70b4bf5..dd481e26b8 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -49,6 +49,9 @@ #define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \ STATS_BDR_FMT, s, w, STATS_BDR_FMT) +typedef int (*desc_dump_t)(FILE *file, uint16_t port_id, uint16_t queue_id, + uint16_t desc_id); + /**< mask of enabled ports */ static unsigned long enabled_port_mask; /**< Enable stats. */ @@ -107,6 +110,12 @@ static uint32_t enable_shw_version; static uint32_t enable_shw_rss_reta; /**< Enable show module info. */ static uint32_t enable_shw_module_info; +/**< Enable dump buffer descriptor. */ +#define MAX_NB_ITEM 2 +static uint16_t rx_nb_item; +static uint16_t tx_nb_item; +static uint16_t rx_item_opt[MAX_NB_ITEM]; +static uint16_t tx_item_opt[MAX_NB_ITEM]; /**< display usage */ static void @@ -137,6 +146,8 @@ proc_info_usage(const char *prgname) " --show-version: to display DPDK version and firmware version\n" " --show-rss-reta: to display ports redirection table\n" " --show-module-info: to display ports module info\n" + " --show-rx-descriptor queue_id:descriptor_id: to display ports Rx buffer description by queue id and descriptor id\n" + " --show-tx-descriptor queue_id:descriptor_id: to display ports Tx buffer description by queue id and descriptor id\n" " --iter-mempool=name: iterate mempool elements to display content\n" " --dump-regs=file-prefix: dump registers to file with the file-prefix\n", prgname); @@ -189,6 +200,34 @@ parse_xstats_ids(char *list, uint64_t *ids, int limit) { return length; } +/* + * Parse ids value list into array + */ +static int +parse_descriptor_param(char *list, uint16_t *item_opt, int limit) +{ + int length; + char *token; + char *ctx = NULL; + char *endptr; + + length = 0; + token = strtok_r(list, ":", &ctx); + while (token != NULL) { + item_opt[length] = strtoul(token, &endptr, 10); + if (*endptr != '\0') + return -EINVAL; + + length++; + if (length > limit) + return -E2BIG; + + token = strtok_r(NULL, ":", &ctx); + } + + return length; +} + static int proc_info_preparse_args(int argc, char **argv) { @@ -251,6 +290,8 @@ proc_info_parse_args(int argc, char **argv) {"show-version", 0, NULL, 0}, {"show-rss-reta", 0, NULL, 0}, {"show-module-info", 0, NULL, 0}, + {"show-rx-descriptor", required_argument, NULL, 1}, + {"show-tx-descriptor", required_argument, NULL, 1}, {NULL, 0, 0, 0} }; @@ -348,6 +389,26 @@ proc_info_parse_args(int argc, char **argv) return -1; } nb_xstats_ids = ret; + } else if (!strncmp(long_option[option_index].name, + "show-rx-descriptor", MAX_LONG_OPT_SZ)) { + int ret = parse_descriptor_param(optarg, + rx_item_opt, + MAX_NB_ITEM); + if (ret < MAX_NB_ITEM) { + printf("Rx descriptor param parse error.\n"); + return -1; + } + rx_nb_item = ret; + } else if (!strncmp(long_option[option_index].name, + "show-tx-descriptor", MAX_LONG_OPT_SZ)) { + int ret = parse_descriptor_param(optarg, + tx_item_opt, + MAX_NB_ITEM); + if (ret < MAX_NB_ITEM) { + printf("Tx descriptor param parse error.\n"); + return -1; + } + tx_nb_item = ret; } break; default: @@ -1597,6 +1658,20 @@ static void show_module_eeprom_info(void) } } +static void +nic_descriptor_display(uint16_t port_id, uint16_t *item_opt, + desc_dump_t desc_dump) +{ + static const char *nic_desc_border = "###"; + uint16_t queue_id = item_opt[0]; + uint16_t desc_id = item_opt[1]; + + printf("%s NIC descriptor for port %u %s\n", + nic_desc_border, port_id, nic_desc_border); + + desc_dump(stdout, port_id, queue_id, desc_id); +} + int main(int argc, char **argv) { @@ -1680,6 +1755,12 @@ main(int argc, char **argv) else if (nb_xstats_ids > 0) nic_xstats_by_ids_display(i, xstats_ids, nb_xstats_ids); + else if (rx_nb_item > 0) + nic_descriptor_display(i, rx_item_opt, + rte_eth_rx_hw_desc_dump); + else if (tx_nb_item > 0) + nic_descriptor_display(i, tx_item_opt, + rte_eth_tx_hw_desc_dump); #ifdef RTE_LIB_METRICS else if (enable_metrics) metrics_display(i);