From patchwork Fri May 27 01:42:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 111928 X-Patchwork-Delegate: thomas@monjalon.net 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 879B0A0558; Fri, 27 May 2022 03:44:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89BA3427F0; Fri, 27 May 2022 03:44:22 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id B0FFC410DC for ; Fri, 27 May 2022 03:44:20 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L8SFS4yGZzQkFp for ; Fri, 27 May 2022 09:41:16 +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 09:44:18 +0800 From: "Min Hu (Connor)" To: CC: "Min Hu (Connor)" , Maryam Tahhan , Reshma Pattan Subject: [PATCH 1/3] app/procinfo: add version dump Date: Fri, 27 May 2022 09:42:56 +0800 Message-ID: <20220527014259.38559-2-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527014259.38559-1-humin29@huawei.com> References: <20220527014259.38559-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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 add support for dump dpdk version and firmware version. The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- show-version Signed-off-by: Min Hu (Connor) --- app/proc-info/main.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 56070a3317..d5eff8cf8a 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -39,6 +39,7 @@ #include #include #include +#include /* Maximum long option length for option parsing. */ #define MAX_LONG_OPT_SZ 64 @@ -100,6 +101,8 @@ static char *mempool_iter_name; /**< Enable dump regs. */ static uint32_t enable_dump_regs; static char *dump_regs_file_prefix; +/**< Enable show version. */ +static uint32_t enable_shw_version; /**< display usage */ static void @@ -127,6 +130,7 @@ proc_info_usage(const char *prgname) " --show-crypto: to display crypto information\n" " --show-ring[=name]: to display ring information\n" " --show-mempool[=name]: to display mempool information\n" + " --show-version: to display DPDK version and firmware version\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); @@ -238,6 +242,7 @@ proc_info_parse_args(int argc, char **argv) {"show-mempool", optional_argument, NULL, 0}, {"iter-mempool", required_argument, NULL, 0}, {"dump-regs", required_argument, NULL, 0}, + {"show-version", 0, NULL, 0}, {NULL, 0, 0, 0} }; @@ -306,7 +311,9 @@ proc_info_parse_args(int argc, char **argv) "dump-regs", MAX_LONG_OPT_SZ)) { enable_dump_regs = 1; dump_regs_file_prefix = optarg; - } + } else if (!strncmp(long_option[option_index].name, + "show-version", MAX_LONG_OPT_SZ)) + enable_shw_version = 1; break; case 1: /* Print xstat single value given by name*/ @@ -1450,6 +1457,35 @@ dump_regs(char *file_prefix) } } +static void show_version(void) +{ +#define ETHDEV_FWVERS_LEN 32 + + char fw_version[ETHDEV_FWVERS_LEN]; + int i; + + snprintf(bdr_str, MAX_STRING_LEN, " show - version "); + STATS_BDR_STR(10, bdr_str); + printf("DPDK version: %s\n", rte_version()); + + RTE_ETH_FOREACH_DEV(i) { + /* Skip if port is not in mask */ + if ((enabled_port_mask & (1ul << i)) == 0) + continue; + + if (!rte_eth_dev_is_valid_port(i)) { + printf("Error: Invalid port number %u\n", i); + continue; + } + + if (rte_eth_dev_fw_version_get(i, fw_version, + ETHDEV_FWVERS_LEN) == 0) + printf("Firmware version: %s\n", fw_version); + else + printf("Firmware version: %s\n", "not available"); + } +} + int main(int argc, char **argv) { @@ -1561,7 +1597,8 @@ main(int argc, char **argv) iter_mempool(mempool_iter_name); if (enable_dump_regs) dump_regs(dump_regs_file_prefix); - + if (enable_shw_version) + show_version(); RTE_ETH_FOREACH_DEV(i) rte_eth_dev_close(i); From patchwork Fri May 27 01:42:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 111929 X-Patchwork-Delegate: thomas@monjalon.net 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 ADAC0A0558; Fri, 27 May 2022 03:44:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7213C427F5; Fri, 27 May 2022 03:44:25 +0200 (CEST) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id 9D77F410DC for ; Fri, 27 May 2022 03:44:21 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4L8SHC2B2cz1JBtC for ; Fri, 27 May 2022 09:42:47 +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 09:44:19 +0800 From: "Min Hu (Connor)" To: CC: "Min Hu (Connor)" , Maryam Tahhan , Reshma Pattan Subject: [PATCH 2/3] app/procinfo: add RSS RETA dump Date: Fri, 27 May 2022 09:42:57 +0800 Message-ID: <20220527014259.38559-3-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527014259.38559-1-humin29@huawei.com> References: <20220527014259.38559-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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 add support for RSS reta dump. The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- show-rss-reta Signed-off-by: Min Hu (Connor) --- app/proc-info/main.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index d5eff8cf8a..48218d1a88 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -103,6 +103,8 @@ static uint32_t enable_dump_regs; static char *dump_regs_file_prefix; /**< Enable show version. */ static uint32_t enable_shw_version; +/**< Enable show RSS reta. */ +static uint32_t enable_shw_rss_reta; /**< display usage */ static void @@ -131,6 +133,7 @@ proc_info_usage(const char *prgname) " --show-ring[=name]: to display ring information\n" " --show-mempool[=name]: to display mempool information\n" " --show-version: to display DPDK version and firmware version\n" + " --show-rss-reta: to display ports redirection table\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); @@ -243,6 +246,7 @@ proc_info_parse_args(int argc, char **argv) {"iter-mempool", required_argument, NULL, 0}, {"dump-regs", required_argument, NULL, 0}, {"show-version", 0, NULL, 0}, + {"show-rss-reta", 0, NULL, 0}, {NULL, 0, 0, 0} }; @@ -314,6 +318,9 @@ proc_info_parse_args(int argc, char **argv) } else if (!strncmp(long_option[option_index].name, "show-version", MAX_LONG_OPT_SZ)) enable_shw_version = 1; + else if (!strncmp(long_option[option_index].name, + "show-rss-reta", MAX_LONG_OPT_SZ)) + enable_shw_rss_reta = 1; break; case 1: /* Print xstat single value given by name*/ @@ -1486,6 +1493,57 @@ static void show_version(void) } } +static void show_port_rss_reta_info(void) +{ +#define RTE_RETA_CONF_GROUP_NUM 32 +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + + struct rte_eth_rss_reta_entry64 reta_conf[RTE_RETA_CONF_GROUP_NUM + 1]; + struct rte_eth_dev_info dev_info; + uint16_t i, idx, shift; + uint16_t num; + uint16_t id; + int ret; + + RTE_ETH_FOREACH_DEV(id) { + /* Skip if port is not in mask */ + if ((enabled_port_mask & (1ul << id)) == 0) + continue; + + snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", id); + STATS_BDR_STR(5, bdr_str); + + if (!rte_eth_dev_is_valid_port(id)) { + printf("Error: Invalid port number %u\n", id); + continue; + } + + ret = rte_eth_dev_info_get(id, &dev_info); + if (ret < 0) { + printf("get device info fail, ret = %d\n", ret); + return; + } + + num = DIV_ROUND_UP(dev_info.reta_size, RTE_ETH_RETA_GROUP_SIZE); + memset(reta_conf, 0, sizeof(reta_conf)); + for (i = 0; i < num; i++) + reta_conf[i].mask = ~0ULL; + + ret = rte_eth_dev_rss_reta_query(id, reta_conf, dev_info.reta_size); + if (ret < 0) { + printf("failed to get RSS RETA info, ret = %d\n", ret); + return; + } + + for (i = 0; i < dev_info.reta_size; i++) { + idx = i / RTE_ETH_RETA_GROUP_SIZE; + shift = i % RTE_ETH_RETA_GROUP_SIZE; + printf("RSS RETA configuration: hash index=%u, queue=%u\n", + i, reta_conf[idx].reta[shift]); + } + } +} + int main(int argc, char **argv) { @@ -1599,6 +1657,8 @@ main(int argc, char **argv) dump_regs(dump_regs_file_prefix); if (enable_shw_version) show_version(); + if (enable_shw_rss_reta) + show_port_rss_reta_info(); RTE_ETH_FOREACH_DEV(i) rte_eth_dev_close(i); From patchwork Fri May 27 01:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 111930 X-Patchwork-Delegate: thomas@monjalon.net 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 AA9FEA0558; Fri, 27 May 2022 03:44:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E96C4281C; Fri, 27 May 2022 03:44:26 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id CC11C427F5 for ; Fri, 27 May 2022 03:44:22 +0200 (CEST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4L8SHq0YRlzjWyB for ; Fri, 27 May 2022 09:43:19 +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 09:44:20 +0800 From: "Min Hu (Connor)" To: CC: "Min Hu (Connor)" , Maryam Tahhan , Reshma Pattan Subject: [PATCH 3/3] app/procinfo: add module info dump Date: Fri, 27 May 2022 09:42:58 +0800 Message-ID: <20220527014259.38559-4-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220527014259.38559-1-humin29@huawei.com> References: <20220527014259.38559-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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 add support for module info dump. The command is like: dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- show-module-info Signed-off-by: Min Hu (Connor) --- app/proc-info/main.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/app/proc-info/main.c b/app/proc-info/main.c index 48218d1a88..b7e70b4bf5 100644 --- a/app/proc-info/main.c +++ b/app/proc-info/main.c @@ -105,6 +105,8 @@ static char *dump_regs_file_prefix; static uint32_t enable_shw_version; /**< Enable show RSS reta. */ static uint32_t enable_shw_rss_reta; +/**< Enable show module info. */ +static uint32_t enable_shw_module_info; /**< display usage */ static void @@ -134,6 +136,7 @@ proc_info_usage(const char *prgname) " --show-mempool[=name]: to display mempool information\n" " --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" " --iter-mempool=name: iterate mempool elements to display content\n" " --dump-regs=file-prefix: dump registers to file with the file-prefix\n", prgname); @@ -247,6 +250,7 @@ proc_info_parse_args(int argc, char **argv) {"dump-regs", required_argument, NULL, 0}, {"show-version", 0, NULL, 0}, {"show-rss-reta", 0, NULL, 0}, + {"show-module-info", 0, NULL, 0}, {NULL, 0, 0, 0} }; @@ -321,6 +325,9 @@ proc_info_parse_args(int argc, char **argv) else if (!strncmp(long_option[option_index].name, "show-rss-reta", MAX_LONG_OPT_SZ)) enable_shw_rss_reta = 1; + else if (!strncmp(long_option[option_index].name, + "show-module-info", MAX_LONG_OPT_SZ)) + enable_shw_module_info = 1; break; case 1: /* Print xstat single value given by name*/ @@ -1544,6 +1551,52 @@ static void show_port_rss_reta_info(void) } } +static void show_module_eeprom_info(void) +{ +#define EEPROM_DUMP_CHUNKSIZE 1024 + + unsigned char bytes_eeprom[EEPROM_DUMP_CHUNKSIZE]; + struct rte_eth_dev_module_info module_info; + struct rte_dev_eeprom_info eeprom_info; + uint16_t i; + int ret; + + RTE_ETH_FOREACH_DEV(i) { + /* Skip if port is not in mask */ + if ((enabled_port_mask & (1ul << i)) == 0) + continue; + + snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", i); + STATS_BDR_STR(5, bdr_str); + + if (!rte_eth_dev_is_valid_port(i)) { + printf("Error: Invalid port number %u\n", i); + continue; + } + + ret = rte_eth_dev_get_module_info(i, &module_info); + if (ret != 0) { + printf("Module EEPROM information read error %d\n", ret); + return; + } + + eeprom_info.offset = 0; + eeprom_info.length = module_info.eeprom_len; + eeprom_info.data = bytes_eeprom; + + ret = rte_eth_dev_get_module_eeprom(i, &eeprom_info); + if (ret != 0) { + printf("Module EEPROM read error %d\n", ret); + return; + } + + rte_hexdump(stdout, "hexdump", eeprom_info.data, + eeprom_info.length); + printf("Finish -- Port: %d MODULE EEPROM length: %d bytes\n", + i, eeprom_info.length); + } +} + int main(int argc, char **argv) { @@ -1659,6 +1712,8 @@ main(int argc, char **argv) show_version(); if (enable_shw_rss_reta) show_port_rss_reta_info(); + if (enable_shw_module_info) + show_module_eeprom_info(); RTE_ETH_FOREACH_DEV(i) rte_eth_dev_close(i);