|WARNING| pw111932-111934 [PATCH] [4/4] app/procinfo: support descriptor dump

|WARNING| pw111932-111934 [PATCH] [4/4] app/procinfo: support descriptor dump

[dpdklab]

[-- Attachment #1: Type: text/plain, Size: 5238 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/111932

_apply patch failure_

Submitter: Min Hu (Connor) <humin29@huawei.com>
Date: Friday, May 27 2022 02:33:51 
Applied on: CommitID:64fcadeac0f70c8c9c215196a3d580b4ad37dcdc
Apply patch set 111932-111934 failed:

Checking patch doc/guides/rel_notes/release_22_07.rst...
error: while searching for:
  * Added AH mode support in lookaside protocol (IPsec) for CN9K & CN10K.
  * Added AES-GMAC support in lookaside protocol (IPsec) for CN9K & CN10K.


Removed Items
-------------

error: patch failed: doc/guides/rel_notes/release_22_07.rst:95
Checking patch lib/ethdev/ethdev_driver.h...
Checking patch lib/ethdev/rte_ethdev.c...
Hunk #1 succeeded at 5876 (offset 2 lines).
Checking patch lib/ethdev/rte_ethdev.h...
Hunk #1 succeeded at 5452 (offset -4 lines).
Checking patch lib/ethdev/version.map...
error: while searching for:
	rte_mtr_color_in_protocol_priority_get;
	rte_mtr_color_in_protocol_set;
	rte_mtr_meter_vlan_table_update;
};

INTERNAL {

error: patch failed: lib/ethdev/version.map:285
Applying patch doc/guides/rel_notes/release_22_07.rst with 1 reject...
Rejected hunk #1.
Applied patch lib/ethdev/ethdev_driver.h cleanly.
Applied patch lib/ethdev/rte_ethdev.c cleanly.
Applied patch lib/ethdev/rte_ethdev.h cleanly.
Applying patch lib/ethdev/version.map with 1 reject...
Rejected hunk #1.
diff a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst	(rejected hunks)
@@ -95,6 +95,12 @@ New Features
   * Added AH mode support in lookaside protocol (IPsec) for CN9K & CN10K.
   * Added AES-GMAC support in lookaside protocol (IPsec) for CN9K & CN10K.
 
+* **Added ethdev HW desc dump API, to dump Rx/Tx HW desc info from device.**
+
+  Added the ethdev HW Rx desc dump API which provides functions for query
+  HW descriptor from device. HW descriptor info differs in different NICs.
+  The information demonstrates I/O process which is important for debug.
+  As the information is different between NICs, the new API is introduced.
 
 Removed Items
 -------------
diff a/lib/ethdev/version.map b/lib/ethdev/version.map	(rejected hunks)
@@ -285,6 +285,8 @@ EXPERIMENTAL {
 	rte_mtr_color_in_protocol_priority_get;
 	rte_mtr_color_in_protocol_set;
 	rte_mtr_meter_vlan_table_update;
+	rte_eth_rx_hw_desc_dump;
+	rte_eth_tx_hw_desc_dump;
 };
 
 INTERNAL {
Checking patch app/proc-info/main.c...
Hunk #1 succeeded at 48 (offset -1 lines).
error: while searching for:
static uint32_t enable_shw_rss_reta;
/**< Enable show module info. */
static uint32_t enable_shw_module_info;

/**< display usage */
static void

error: patch failed: app/proc-info/main.c:107
error: while searching for:
		"  --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);

error: patch failed: app/proc-info/main.c:137
Hunk #4 succeeded at 182 (offset -18 lines).
error: while searching for:
		{"show-version", 0, NULL, 0},
		{"show-rss-reta", 0, NULL, 0},
		{"show-module-info", 0, NULL, 0},
		{NULL, 0, 0, 0}
	};


error: patch failed: app/proc-info/main.c:251
Hunk #6 succeeded at 358 (offset -31 lines).
Hunk #7 succeeded at 1501 (offset -157 lines).
Hunk #8 succeeded at 1598 (offset -157 lines).
Applying patch app/proc-info/main.c with 3 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
Hunk #4 applied cleanly.
Rejected hunk #5.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Hunk #8 applied cleanly.
diff a/app/proc-info/main.c b/app/proc-info/main.c	(rejected hunks)
@@ -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);
@@ -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}
 	};
 

https://lab.dpdk.org/results/dashboard/patchsets/22319/

UNH-IOL DPDK Community Lab