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

_apply patch failure_

Submitter: Hanumanth Pothula <hpothula@marvell.com>
Date: Tuesday, August 02 2022 16:45:28 
Applied on: CommitID:72206323a5dd3182b13f61b25a64abdddfee595c
Apply patch set 114542-114543 failed:

Checking patch app/test-pmd/parameters.c...
error: while searching for:
	printf("  --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n"
	       "    0x10 - explicit Tx rule, 0x02 - hairpin ports paired\n"
	       "    0x01 - hairpin ports loop, 0x00 - hairpin port self\n");
}

#ifdef RTE_LIB_CMDLINE

error: patch failed: app/test-pmd/parameters.c:213
error: while searching for:
		{ "record-burst-stats",         0, 0, 0 },
		{ PARAM_NUM_PROCS,              1, 0, 0 },
		{ PARAM_PROC_ID,                1, 0, 0 },
		{ 0, 0, 0, 0 },
	};


error: patch failed: app/test-pmd/parameters.c:710
error: while searching for:
				num_procs = atoi(optarg);
			if (!strcmp(lgopts[opt_idx].name, PARAM_PROC_ID))
				proc_id = atoi(optarg);
			break;
		case 'h':
			usage(argv[0]);

error: patch failed: app/test-pmd/parameters.c:1510
Checking patch app/test-pmd/testpmd.c...
error: while searching for:
/* Hairpin ports configuration mode. */
uint16_t hairpin_mode;

/* Pretty printing of ethdev events */
static const char * const eth_event_desc[] = {
	[RTE_ETH_EVENT_UNKNOWN] = "unknown",

error: patch failed: app/test-pmd/testpmd.c:411
error: while searching for:
	int ret;
	int i;

	eth_rx_metadata_negotiate_mp(pid);

	port->dev_conf.txmode = tx_mode;
	port->dev_conf.rxmode = rx_mode;

error: patch failed: app/test-pmd/testpmd.c:1628
Checking patch app/test-pmd/testpmd.h...
error: while searching for:
extern uint32_t burst_tx_delay_time; /**< Burst tx delay time(us) for mac-retry. */
extern uint32_t burst_tx_retry_num;  /**< Burst tx retry number for mac-retry. */

#ifdef RTE_LIB_GRO
#define GRO_DEFAULT_ITEM_NUM_PER_FLOW 32
#define GRO_DEFAULT_FLOW_NUM (RTE_GRO_MAX_BURST_ITEM_NUM / \

error: patch failed: app/test-pmd/testpmd.h:621
Applying patch app/test-pmd/parameters.c with 3 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Applying patch app/test-pmd/testpmd.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch app/test-pmd/testpmd.h with 1 reject...
Rejected hunk #1.
diff a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c	(rejected hunks)
@@ -213,6 +213,7 @@ usage(char* progname)
 	printf("  --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n"
 	       "    0x10 - explicit Tx rule, 0x02 - hairpin ports paired\n"
 	       "    0x01 - hairpin ports loop, 0x00 - hairpin port self\n");
+	printf("  --nic-to-pmd-rx-metadata: let the NIC deliver per-packet Rx metadata to PMD\n");
 }
 
 #ifdef RTE_LIB_CMDLINE
@@ -710,6 +711,7 @@ launch_args_parse(int argc, char** argv)
 		{ "record-burst-stats",         0, 0, 0 },
 		{ PARAM_NUM_PROCS,              1, 0, 0 },
 		{ PARAM_PROC_ID,                1, 0, 0 },
+		{ "nic-to-pmd-rx-metadata",     0, 0, 0 },
 		{ 0, 0, 0, 0 },
 	};
 
@@ -1510,6 +1512,8 @@ launch_args_parse(int argc, char** argv)
 				num_procs = atoi(optarg);
 			if (!strcmp(lgopts[opt_idx].name, PARAM_PROC_ID))
 				proc_id = atoi(optarg);
+			if (!strcmp(lgopts[opt_idx].name, "nic-to-pmd-rx-metadata"))
+				nic_to_pmd_rx_metadata = 1;
 			break;
 		case 'h':
 			usage(argv[0]);
diff a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c	(rejected hunks)
@@ -411,6 +411,9 @@ uint8_t clear_ptypes = true;
 /* Hairpin ports configuration mode. */
 uint16_t hairpin_mode;
 
+/* Send Rx metadata */
+uint8_t nic_to_pmd_rx_metadata;
+
 /* Pretty printing of ethdev events */
 static const char * const eth_event_desc[] = {
 	[RTE_ETH_EVENT_UNKNOWN] = "unknown",
@@ -1628,7 +1631,8 @@ init_config_port_offloads(portid_t pid, uint32_t socket_id)
 	int ret;
 	int i;
 
-	eth_rx_metadata_negotiate_mp(pid);
+	if (nic_to_pmd_rx_metadata)
+		eth_rx_metadata_negotiate_mp(pid);
 
 	port->dev_conf.txmode = tx_mode;
 	port->dev_conf.rxmode = rx_mode;
diff a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h	(rejected hunks)
@@ -621,6 +621,8 @@ extern struct rte_ether_addr peer_eth_addrs[RTE_MAX_ETHPORTS];
 extern uint32_t burst_tx_delay_time; /**< Burst tx delay time(us) for mac-retry. */
 extern uint32_t burst_tx_retry_num;  /**< Burst tx retry number for mac-retry. */
 
+extern uint8_t nic_to_pmd_rx_metadata;
+
 #ifdef RTE_LIB_GRO
 #define GRO_DEFAULT_ITEM_NUM_PER_FLOW 32
 #define GRO_DEFAULT_FLOW_NUM (RTE_GRO_MAX_BURST_ITEM_NUM / \

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

UNH-IOL DPDK Community Lab