diff mbox series

[1/6] app/procinfo: add version dump

Message ID 20220722091236.15469-2-liudongdong3@huawei.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series app/procinfo: add some extended features |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Dongdong Liu July 22, 2022, 9:12 a.m. UTC 
  From: "Min Hu (Connor)" <humin29@huawei.com>

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) <humin29@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 app/proc-info/main.c | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

Comments

Pattan, Reshma Sept. 19, 2022, 9:23 a.m. UTC | #1 
> -----Original Message-----
> From: Dongdong Liu <liudongdong3@huawei.com>
> Subject: [PATCH 1/6] app/procinfo: add version dump

If this is V2 version of patch, please add V2 in the patch heading.
And can you mark the previous version of patches  "Superseded" in the patchwork.

> dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- show-version

 --show-version? But not -- show-version.


> --- a/app/proc-info/main.c
> +		"  --show-version: to display DPDK version and firmware
> version\n"

Say ethdev firmware version.  Instead of just firmware version.

> 
> +static void show_version(void)

Divide this into 2 lines. "static void" should be in one line and "show_version(void)" should be in another line.
Please check the other functions in the file for an example.


> +{
> +#define ETHDEV_FWVERS_LEN 32

Can this definition be moved to top of the file along with the other #defines.


> +
> 	ETHDEV_FWVERS_LEN) == 0)
> +			printf("Firmware version: %s\n", fw_version);

Better to include Ethdev <port id> Firmware version.

Thanks,
Reshma
Dongdong Liu Sept. 20, 2022, 2:35 a.m. UTC | #2 
Hi Pattan

Many thanks for you review.

On 2022/9/19 17:23, Pattan, Reshma wrote:
>
>
>> -----Original Message-----
>> From: Dongdong Liu <liudongdong3@huawei.com>
>> Subject: [PATCH 1/6] app/procinfo: add version dump
>
> If this is V2 version of patch, please add V2 in the patch heading.
> And can you mark the previous version of patches  "Superseded" in the patchwork.
Yes, will do, thanks for reminding this.

>
>> dpdk-proc-info -a xxxx:xx:xx.x --file-prefix=xxx -- -- show-version
>
>  --show-version? But not -- show-version.
Will fix.
>
>
>> --- a/app/proc-info/main.c
>> +		"  --show-version: to display DPDK version and firmware
>> version\n"
>
> Say ethdev firmware version.  Instead of just firmware version.
Will fix.
>
>>
>> +static void show_version(void)
>
> Divide this into 2 lines. "static void" should be in one line and "show_version(void)" should be in another line.
> Please check the other functions in the file for an example.
Will do.
>
>
>> +{
>> +#define ETHDEV_FWVERS_LEN 32
>
> Can this definition be moved to top of the file along with the other #defines.
Yes, Will do.
>
>
>> +
>> 	ETHDEV_FWVERS_LEN) == 0)
>> +			printf("Firmware version: %s\n", fw_version);
>
> Better to include Ethdev <port id> Firmware version.
Will do.

Thanks,
Dongdong
>
> Thanks,
> Reshma
> .
>
diff mbox series

Patch

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 1bfba5f60d..223ff439a4 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -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
@@ -102,6 +103,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
@@ -130,6 +133,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);
@@ -242,6 +246,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}
 	};
 
@@ -313,7 +318,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*/
@@ -1476,6 +1483,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)
 {
@@ -1589,7 +1625,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);