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

_apply patch failure_

Submitter: Volodymyr Fialko <vfialko@marvell.com>
Date: Wednesday, April 27 2022 09:20:20 
Applied on: CommitID:55ae8965bf8eecd5ebec36663bb0f36018abf64b
Apply patch set 110325 failed:

Checking patch examples/ipsec-secgw/ipsec-secgw.c...
Hunk #1 succeeded at 1251 (offset 567 lines).
Hunk #2 succeeded at 2019 (offset 565 lines).
Hunk #3 succeeded at 2038 (offset 565 lines).
error: while searching for:
				cdev_id, qp, i);
	}

	ret = rte_hash_add_key_data(map, &key, (void *)i);
	if (ret < 0) {
		printf("Faled to insert cdev mapping for (lcore %u, "
				"cdev %u, qp %u), errno %d\n",

error: patch failed: examples/ipsec-secgw/ipsec-secgw.c:1499
Hunk #5 succeeded at 2078 (offset 565 lines).
Hunk #6 succeeded at 2105 (offset 565 lines).
Hunk #7 succeeded at 2121 (offset 565 lines).
error: while searching for:
		if ((socket_ctx[socket_id].mbuf_pool != NULL) &&
			(socket_ctx[socket_id].sa_in == NULL) &&
			(socket_ctx[socket_id].sa_out == NULL)) {
			sa_init(&socket_ctx[socket_id], socket_id);
			sp4_init(&socket_ctx[socket_id], socket_id);
			sp6_init(&socket_ctx[socket_id], socket_id);
			rt_init(&socket_ctx[socket_id], socket_id);

error: patch failed: examples/ipsec-secgw/ipsec-secgw.c:3074
Checking patch examples/ipsec-secgw/ipsec.c...
error: while searching for:
			return -1;
		}
	} else {
		uint16_t cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;

		if (ips->type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
			struct rte_cryptodev_info info;


error: patch failed: examples/ipsec-secgw/ipsec.c:130
error: while searching for:
		}
		ips->crypto.dev_id = cdev_id;
		ips->crypto.ses = rte_cryptodev_sym_session_create(
				ipsec_ctx->session_pool);
		rte_cryptodev_sym_session_init(cdev_id,
				ips->crypto.ses, sa->xforms,
				ipsec_ctx->session_priv_pool);

		rte_cryptodev_info_get(cdev_id, &cdev_info);
	}

	sa->cdev_id_qp = cdev_id_qp;

	return 0;
}


error: patch failed: examples/ipsec-secgw/ipsec.c:143
Hunk #5 succeeded at 655 (offset 4 lines).
Hunk #6 succeeded at 689 (offset 4 lines).
Hunk #7 succeeded at 736 (offset 4 lines).
Checking patch examples/ipsec-secgw/ipsec.h...
Hunk #1 succeeded at 106 (offset -6 lines).
Hunk #2 succeeded at 224 (offset -6 lines).
Hunk #3 succeeded at 388 (offset -35 lines).
Hunk #4 succeeded at 405 (offset -35 lines).
Checking patch examples/ipsec-secgw/ipsec_process.c...
Hunk #1 succeeded at 77 (offset 4 lines).
Hunk #2 succeeded at 173 (offset 4 lines).
Hunk #3 succeeded at 307 (offset 47 lines).
Checking patch examples/ipsec-secgw/ipsec_worker.c...
Hunk #1 succeeded at 890 (offset -2 lines).
Checking patch examples/ipsec-secgw/sa.c...
Hunk #1 succeeded at 1218 (offset -9 lines).
Hunk #2 succeeded at 1390 (offset -9 lines).
Hunk #3 succeeded at 1413 (offset -9 lines).
Hunk #4 succeeded at 1498 (offset -9 lines).
Hunk #5 succeeded at 1639 (offset -9 lines).
Hunk #6 succeeded at 1670 (offset -9 lines).
Hunk #7 succeeded at 1692 (offset -9 lines).
Applying patch examples/ipsec-secgw/ipsec-secgw.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.
Applying patch examples/ipsec-secgw/ipsec.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Rejected hunk #3.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Applied patch examples/ipsec-secgw/ipsec.h cleanly.
Applied patch examples/ipsec-secgw/ipsec_process.c cleanly.
Applied patch examples/ipsec-secgw/ipsec_worker.c 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)
@@ -1499,7 +1495,7 @@ add_mapping(struct rte_hash *map, const char *str, uint16_t cdev_id,
 				cdev_id, qp, i);
 	}
 
-	ret = rte_hash_add_key_data(map, &key, (void *)i);
+	ret = rte_hash_add_key_data(ipsec_ctx->cdev_map, &key, (void *)i);
 	if (ret < 0) {
 		printf("Faled to insert cdev mapping for (lcore %u, "
 				"cdev %u, qp %u), errno %d\n",
@@ -3074,7 +3069,7 @@ main(int32_t argc, char **argv)
 		if ((socket_ctx[socket_id].mbuf_pool != NULL) &&
 			(socket_ctx[socket_id].sa_in == NULL) &&
 			(socket_ctx[socket_id].sa_out == NULL)) {
-			sa_init(&socket_ctx[socket_id], socket_id);
+			sa_init(&socket_ctx[socket_id], socket_id, lcore_conf);
 			sp4_init(&socket_ctx[socket_id], socket_id);
 			sp6_init(&socket_ctx[socket_id], socket_id);
 			rt_init(&socket_ctx[socket_id], socket_id);
diff a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c	(rejected hunks)
@@ -130,8 +164,6 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
 			return -1;
 		}
 	} else {
-		uint16_t cdev_id = ipsec_ctx->tbl[cdev_id_qp].id;
-
 		if (ips->type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
 			struct rte_cryptodev_info info;
 
@@ -143,16 +175,14 @@ create_lookaside_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa,
 		}
 		ips->crypto.dev_id = cdev_id;
 		ips->crypto.ses = rte_cryptodev_sym_session_create(
-				ipsec_ctx->session_pool);
+				skt_ctx->session_pool);
 		rte_cryptodev_sym_session_init(cdev_id,
 				ips->crypto.ses, sa->xforms,
-				ipsec_ctx->session_priv_pool);
+				skt_ctx->session_priv_pool);
 
 		rte_cryptodev_info_get(cdev_id, &cdev_info);
 	}
 
-	sa->cdev_id_qp = cdev_id_qp;
-
 	return 0;
 }
 

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

UNH-IOL DPDK Community Lab