Skip to contentSkip to conversation

support dump ethdev info

PATCH In review Min Hu (Connor) 3 participants 6 messages May 27, 2022 – Jul 2, 2022

lore
Share & tools
lore
#0 lore raw

cover support dump ethdev info

This patch set support ethdev info about firmware version, RSS reta info, and module info.

Min Hu (Connor) (3):
app/procinfo: add version dump
app/procinfo: add RSS RETA dump
app/procinfo: add module info dump

 app/proc-info/main.c | 156 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 154 insertions(+), 2 deletions(-)
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/3 app/procinfo: add version dump

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

---
 app/proc-info/main.c | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)
app/proc-info/main.c +39 -2
index 56070a3317..d5eff8cf8a 100644
@@ -39,6 +39,7 @@
 #include <rte_cryptodev.h>
 #include <rte_tm.h>
 #include <rte_hexdump.h>
+#include <rte_version.h>
 
 /* 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);
 
Signature · 1 line
2.33.0
#2 lore raw

PATCH 2/3 app/procinfo: add RSS RETA dump

In reply to Min Hu (Connor)

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

---
 app/proc-info/main.c | 60 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
app/proc-info/main.c +60 -0
index d5eff8cf8a..48218d1a88 100644
@@ -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);
 
Signature · 1 line
2.33.0
#3 lore raw

PATCH 3/3 app/procinfo: add module info dump

In reply to Min Hu (Connor)

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

---
 app/proc-info/main.c | 55 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
app/proc-info/main.c +55 -0
index 48218d1a88..b7e70b4bf5 100644
@@ -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);
 
Signature · 1 line
2.33.0
#4 lore raw
In reply to Min Hu (Connor)

Hi Reshma, please could you have a look at these patches?

We need to update the email address of Maryam as well.

Thanks

27/05/2022 03:42, Min Hu (Connor):

Quoted 4 lines

Min Hu (Connor) (3):
app/procinfo: add version dump
app/procinfo: add RSS RETA dump
app/procinfo: add module info dump

#5 lore raw
In reply to Min Hu (Connor)

Hi Reshma

Kind ping :)
Please help to have a look at these patches when you have time.

Thanks,
Dongdong

Quoted 11 lines · Min Hu (Connor)

This patch set support ethdev info about firmware version, RSS reta info, and module info.

Min Hu (Connor) (3):
app/procinfo: add version dump
app/procinfo: add RSS RETA dump
app/procinfo: add module info dump

 app/proc-info/main.c | 156 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 154 insertions(+), 2 deletions(-)