|WARNING| pw119235 [PATCH] [v2] examples/ipsec-secgw: support per SA HW reassembly

|WARNING| pw119235 [PATCH] [v2] examples/ipsec-secgw: support per SA HW reassembly

[dpdklab]

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

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

_apply patch failure_

Submitter: Rahul Bhansali <rbhansali@marvell.com>
Date: Thursday, October 27 2022 11:05:01 
Applied on: CommitID:e6b42038e859407af3c8eb0d7d588570622f687a
Apply patch set 119235 failed:

Checking patch doc/guides/sample_app_ug/ipsec_secgw.rst...
Hunk #1 succeeded at 534 (offset -3 lines).
Hunk #2 succeeded at 790 (offset -3 lines).
Checking patch examples/ipsec-secgw/ipsec-secgw.c...
Hunk #1 succeeded at 273 (offset -1 lines).
Hunk #2 succeeded at 303 (offset -1 lines).
Hunk #3 succeeded at 311 (offset -1 lines).
Hunk #4 succeeded at 1856 (offset -17 lines).
Hunk #5 succeeded at 1867 (offset -17 lines).
Hunk #6 succeeded at 2044 (offset -17 lines).
Hunk #7 succeeded at 2593 (offset -19 lines).
Hunk #8 succeeded at 2872 (offset -19 lines).
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:2993
Checking patch examples/ipsec-secgw/ipsec-secgw.h...
error: while searching for:
extern uint32_t nb_bufs_in_pool;

extern bool per_port_pool;

extern uint32_t mtu_size;
extern uint32_t frag_tbl_sz;
extern uint32_t qp_desc_nb;

error: patch failed: examples/ipsec-secgw/ipsec-secgw.h:142
Hunk #4 succeeded at 188 (offset -2 lines).
Checking patch examples/ipsec-secgw/ipsec.c...
Hunk #1 succeeded at 52 (offset -1 lines).
Checking patch examples/ipsec-secgw/ipsec.h...
Hunk #1 succeeded at 131 (offset -1 lines).
Hunk #2 succeeded at 208 (offset -1 lines).
Hunk #3 succeeded at 434 (offset -2 lines).
Checking patch examples/ipsec-secgw/ipsec_worker.c...
Hunk #1 succeeded at 23 (offset -2 lines).
Hunk #2 succeeded at 403 (offset -17 lines).
error: while searching for:
	return PKT_FORWARDED;

drop_pkt_and_exit:
	RTE_LOG(ERR, IPSEC, "Inbound packet dropped\n");
	free_pkts(&pkt, 1);
	ev->mbuf = NULL;
	return PKT_DROPPED;

error: patch failed: examples/ipsec-secgw/ipsec_worker.c:526
Hunk #4 succeeded at 623 (offset -242 lines).
Hunk #5 succeeded at 792 (offset -368 lines).
Hunk #6 succeeded at 989 (offset -376 lines).
Hunk #7 succeeded at 1379 (offset -256 lines).
Checking patch examples/ipsec-secgw/ipsec_worker.h...
Checking patch examples/ipsec-secgw/sa.c...
Hunk #2 succeeded at 1811 (offset -7 lines).
Hunk #3 succeeded at 1837 (offset -7 lines).
Applied patch doc/guides/sample_app_ug/ipsec_secgw.rst cleanly.
Applying patch examples/ipsec-secgw/ipsec-secgw.c with 1 reject...
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.
Hunk #8 applied cleanly.
Rejected hunk #9.
Applying patch examples/ipsec-secgw/ipsec-secgw.h with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Applied patch examples/ipsec-secgw/ipsec.c cleanly.
Applied patch examples/ipsec-secgw/ipsec.h cleanly.
Applying patch examples/ipsec-secgw/ipsec_worker.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied 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)
@@ -2993,10 +3009,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;
 	}
diff a/examples/ipsec-secgw/ipsec-secgw.h b/examples/ipsec-secgw/ipsec-secgw.h	(rejected hunks)
@@ -142,7 +144,8 @@ extern volatile bool force_quit;
 extern uint32_t nb_bufs_in_pool;

 extern bool per_port_pool;
-
+extern int ip_reassembly_dynfield_offset;
+extern uint64_t ip_reassembly_dynflag;
 extern uint32_t mtu_size;
 extern uint32_t frag_tbl_sz;
 extern uint32_t qp_desc_nb;
diff a/examples/ipsec-secgw/ipsec_worker.c b/examples/ipsec-secgw/ipsec_worker.c	(rejected hunks)
@@ -526,7 +533,6 @@ process_ipsec_ev_inbound(struct ipsec_ctx *ctx, struct route_table *rt,
 	return PKT_FORWARDED;

 drop_pkt_and_exit:
-	RTE_LOG(ERR, IPSEC, "Inbound packet dropped\n");
 	free_pkts(&pkt, 1);
 	ev->mbuf = NULL;
 	return PKT_DROPPED;

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

UNH-IOL DPDK Community Lab