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

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Monday, August 29 2022 15:12:33 
Applied on: CommitID:09521b1cbeffc81c85ef64564719a4b7e1d10e85
Apply patch set 115600 failed:

Checking patch doc/guides/sample_app_ug/ipsec_secgw.rst...
Checking patch examples/ipsec-secgw/ipsec-secgw.c...
Hunk #6 succeeded at 2053 (offset 6 lines).
Hunk #7 succeeded at 2660 (offset 6 lines).
error: while searching for:
	uint16_t portid, nb_crypto_qp, nb_ports = 0;
	uint64_t req_rx_offloads[RTE_MAX_ETHPORTS];
	uint64_t req_tx_offloads[RTE_MAX_ETHPORTS];
	struct eh_conf *eh_conf = NULL;
	uint32_t ipv4_cksum_port_mask = 0;
	size_t sess_sz;

error: patch failed: examples/ipsec-secgw/ipsec-secgw.c:2918
error: while searching for:
		if ((enabled_port_mask & (1 << portid)) == 0)
			continue;

		sa_check_offloads(portid, &req_rx_offloads[portid],
				&req_tx_offloads[portid]);
		port_init(portid, req_rx_offloads[portid],
				req_tx_offloads[portid]);
		if ((req_tx_offloads[portid] & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM))
			ipv4_cksum_port_mask = 1U << portid;
	}

error: patch failed: examples/ipsec-secgw/ipsec-secgw.c:3037
Checking patch examples/ipsec-secgw/ipsec-secgw.h...
Checking patch examples/ipsec-secgw/ipsec.c...
Checking patch examples/ipsec-secgw/ipsec.h...
Hunk #1 succeeded at 129 (offset -2 lines).
Hunk #2 succeeded at 206 (offset -2 lines).
Hunk #3 succeeded at 433 (offset -2 lines).
Checking patch examples/ipsec-secgw/ipsec_worker.c...
Checking patch examples/ipsec-secgw/ipsec_worker.h...
Checking patch examples/ipsec-secgw/sa.c...
Applied patch doc/guides/sample_app_ug/ipsec_secgw.rst cleanly.
Applying patch examples/ipsec-secgw/ipsec-secgw.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.
Rejected hunk #9.
Applied patch examples/ipsec-secgw/ipsec-secgw.h cleanly.
Applied patch examples/ipsec-secgw/ipsec.c cleanly.
Applied patch examples/ipsec-secgw/ipsec.h cleanly.
Applied patch examples/ipsec-secgw/ipsec_worker.c cleanly.
Applied patch examples/ipsec-secgw/ipsec_worker.h cleanly.
Applied patch examples/ipsec-secgw/sa.c cleanly.
diff a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c	(rejected hunks)
@@ -2918,6 +2933,7 @@ main(int32_t argc, char **argv)
 	uint16_t portid, nb_crypto_qp, nb_ports = 0;
 	uint64_t req_rx_offloads[RTE_MAX_ETHPORTS];
 	uint64_t req_tx_offloads[RTE_MAX_ETHPORTS];
+	uint8_t req_hw_reassembly[RTE_MAX_ETHPORTS];
 	struct eh_conf *eh_conf = NULL;
 	uint32_t ipv4_cksum_port_mask = 0;
 	size_t sess_sz;
@@ -3037,10 +3053,10 @@ main(int32_t argc, char **argv)
 		if ((enabled_port_mask & (1 << portid)) == 0)
 			continue;
 
-		sa_check_offloads(portid, &req_rx_offloads[portid],
-				&req_tx_offloads[portid]);
-		port_init(portid, req_rx_offloads[portid],
-				req_tx_offloads[portid]);
+		sa_check_offloads(portid, &req_rx_offloads[portid], &req_tx_offloads[portid],
+				  &req_hw_reassembly[portid]);
+		port_init(portid, req_rx_offloads[portid], req_tx_offloads[portid],
+			  req_hw_reassembly[portid]);
 		if ((req_tx_offloads[portid] & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM))
 			ipv4_cksum_port_mask = 1U << portid;
 	}

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

UNH-IOL DPDK Community Lab