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

_apply patch failure_

Submitter: Akhil Goyal <gakhil@marvell.com>
Date: Tuesday, August 17 2021 17:48:49 
Applied on: CommitID:a841afe93695cf38f7d2224761e32b13de478b8c
Apply patch set 97014 failed:

Checking patch app/test-crypto-perf/cperf_ops.c...
Hunk #1 succeeded at 35 (offset -27 lines).
Hunk #2 succeeded at 544 (offset -27 lines).
Hunk #3 succeeded at 746 (offset -52 lines).
error: while searching for:

	op_fns->sess_create = cperf_create_session;

	if (options->op_type == CPERF_ASYM_MODEX) {
		op_fns->populate_ops = cperf_set_ops_asym;
		return 0;
	}

	if (options->op_type == CPERF_AEAD) {
		op_fns->populate_ops = cperf_set_ops_aead;
		return 0;
	}

	if (options->op_type == CPERF_AUTH_THEN_CIPHER
			|| options->op_type == CPERF_CIPHER_THEN_AUTH) {
		op_fns->populate_ops = cperf_set_ops_cipher_auth;
		return 0;
	}
	if (options->op_type == CPERF_AUTH_ONLY) {
		if (options->auth_algo == RTE_CRYPTO_AUTH_NULL)
			op_fns->populate_ops = cperf_set_ops_null_auth;
		else
			op_fns->populate_ops = cperf_set_ops_auth;
		return 0;
	}
	if (options->op_type == CPERF_CIPHER_ONLY) {
		if (options->cipher_algo == RTE_CRYPTO_CIPHER_NULL)
			op_fns->populate_ops = cperf_set_ops_null_cipher;
		else
			op_fns->populate_ops = cperf_set_ops_cipher;
		return 0;
	}
#ifdef RTE_LIB_SECURITY
	if (options->op_type == CPERF_PDCP) {
		op_fns->populate_ops = cperf_set_ops_security;
		return 0;
	}
	if (options->op_type == CPERF_DOCSIS) {
		op_fns->populate_ops = cperf_set_ops_security;
		return 0;
	}
#endif
	return -1;
}

error: patch failed: app/test-crypto-perf/cperf_ops.c:872
Checking patch app/test-crypto-perf/cperf_options.h...
error: while searching for:
	CPERF_AEAD,
	CPERF_PDCP,
	CPERF_DOCSIS,
	CPERF_ASYM_MODEX
};


error: patch failed: app/test-crypto-perf/cperf_options.h:80
Checking patch app/test-crypto-perf/cperf_options_parsing.c...
error: while searching for:
			cperf_op_type_strs[CPERF_DOCSIS],
			CPERF_DOCSIS
		},
		{
			cperf_op_type_strs[CPERF_ASYM_MODEX],
			CPERF_ASYM_MODEX

error: patch failed: app/test-crypto-perf/cperf_options_parsing.c:458
Checking patch app/test-crypto-perf/cperf_test_throughput.c...
error: while searching for:
		}
#ifdef RTE_LIB_SECURITY
		else if (ctx->options->op_type == CPERF_PDCP ||
			 ctx->options->op_type == CPERF_DOCSIS) {
			struct rte_security_ctx *sec_ctx =
				(struct rte_security_ctx *)
					rte_cryptodev_get_sec_ctx(ctx->dev_id);

error: patch failed: app/test-crypto-perf/cperf_test_throughput.c:42
Checking patch app/test-crypto-perf/cperf_test_vectors.c...
error: while searching for:
		t_vec->modex.elen = sizeof(perf_mod_e);
	}

	if (options->op_type ==	CPERF_PDCP) {
		if (options->cipher_algo == RTE_CRYPTO_CIPHER_NULL) {
			t_vec->cipher_key.length = 0;
			t_vec->ciphertext.data = plaintext;

error: patch failed: app/test-crypto-perf/cperf_test_vectors.c:448
Hunk #2 succeeded at 543 (offset -37 lines).
Checking patch app/test-crypto-perf/main.c...
error: while searching for:
	[CPERF_AEAD] = "aead",
	[CPERF_PDCP] = "pdcp",
	[CPERF_DOCSIS] = "docsis",
	[CPERF_ASYM_MODEX] = "modex"
};


error: patch failed: app/test-crypto-perf/main.c:41
error: while searching for:
			/* Fall through */
		case CPERF_PDCP:
		case CPERF_DOCSIS:
			/* Fall through */
		default:

			conf.ff_disable |= RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
		}


error: patch failed: app/test-crypto-perf/main.c:278
Applying patch app/test-crypto-perf/cperf_ops.c with 1 reject...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Applying patch app/test-crypto-perf/cperf_options.h with 1 reject...
Rejected hunk #1.
Applying patch app/test-crypto-perf/cperf_options_parsing.c with 1 reject...
Rejected hunk #1.
Applying patch app/test-crypto-perf/cperf_test_throughput.c with 1 reject...
Rejected hunk #1.
Applying patch app/test-crypto-perf/cperf_test_vectors.c with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Applying patch app/test-crypto-perf/main.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
diff a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c	(rejected hunks)
@@ -872,44 +1001,40 @@ cperf_get_op_functions(const struct cperf_options *options,
 
 	op_fns->sess_create = cperf_create_session;
 
-	if (options->op_type == CPERF_ASYM_MODEX) {
-		op_fns->populate_ops = cperf_set_ops_asym;
-		return 0;
-	}
-
-	if (options->op_type == CPERF_AEAD) {
+	switch (options->op_type) {
+	case CPERF_AEAD:
 		op_fns->populate_ops = cperf_set_ops_aead;
-		return 0;
-	}
+		break;
 
-	if (options->op_type == CPERF_AUTH_THEN_CIPHER
-			|| options->op_type == CPERF_CIPHER_THEN_AUTH) {
+	case CPERF_AUTH_THEN_CIPHER:
+	case CPERF_CIPHER_THEN_AUTH:
 		op_fns->populate_ops = cperf_set_ops_cipher_auth;
-		return 0;
-	}
-	if (options->op_type == CPERF_AUTH_ONLY) {
+		break;
+	case CPERF_AUTH_ONLY:
 		if (options->auth_algo == RTE_CRYPTO_AUTH_NULL)
 			op_fns->populate_ops = cperf_set_ops_null_auth;
 		else
 			op_fns->populate_ops = cperf_set_ops_auth;
-		return 0;
-	}
-	if (options->op_type == CPERF_CIPHER_ONLY) {
+		break;
+	case CPERF_CIPHER_ONLY:
 		if (options->cipher_algo == RTE_CRYPTO_CIPHER_NULL)
 			op_fns->populate_ops = cperf_set_ops_null_cipher;
 		else
 			op_fns->populate_ops = cperf_set_ops_cipher;
-		return 0;
-	}
+		break;
+	case CPERF_ASYM_MODEX:
+		op_fns->populate_ops = cperf_set_ops_asym;
+		break;
 #ifdef RTE_LIB_SECURITY
-	if (options->op_type == CPERF_PDCP) {
+	case CPERF_PDCP:
+	case CPERF_IPSEC:
+	case CPERF_DOCSIS:
 		op_fns->populate_ops = cperf_set_ops_security;
-		return 0;
-	}
-	if (options->op_type == CPERF_DOCSIS) {
-		op_fns->populate_ops = cperf_set_ops_security;
-		return 0;
-	}
+		break;
 #endif
-	return -1;
+	default:
+		return -1;
+	}
+
+	return 0;
 }
diff a/app/test-crypto-perf/cperf_options.h b/app/test-crypto-perf/cperf_options.h	(rejected hunks)
@@ -80,6 +80,7 @@ enum cperf_op_type {
 	CPERF_AEAD,
 	CPERF_PDCP,
 	CPERF_DOCSIS,
+	CPERF_IPSEC,
 	CPERF_ASYM_MODEX
 };
 
diff a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c	(rejected hunks)
@@ -458,6 +458,10 @@ parse_op_type(struct cperf_options *opts, const char *arg)
 			cperf_op_type_strs[CPERF_DOCSIS],
 			CPERF_DOCSIS
 		},
+		{
+			cperf_op_type_strs[CPERF_IPSEC],
+			CPERF_IPSEC
+		},
 		{
 			cperf_op_type_strs[CPERF_ASYM_MODEX],
 			CPERF_ASYM_MODEX
diff a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c	(rejected hunks)
@@ -42,7 +42,8 @@ cperf_throughput_test_free(struct cperf_throughput_ctx *ctx)
 		}
 #ifdef RTE_LIB_SECURITY
 		else if (ctx->options->op_type == CPERF_PDCP ||
-			 ctx->options->op_type == CPERF_DOCSIS) {
+			 ctx->options->op_type == CPERF_DOCSIS ||
+			 ctx->options->op_type == CPERF_IPSEC) {
 			struct rte_security_ctx *sec_ctx =
 				(struct rte_security_ctx *)
 					rte_cryptodev_get_sec_ctx(ctx->dev_id);
diff a/app/test-crypto-perf/cperf_test_vectors.c b/app/test-crypto-perf/cperf_test_vectors.c	(rejected hunks)
@@ -448,7 +448,8 @@ cperf_test_vector_get_dummy(struct cperf_options *options)
 		t_vec->modex.elen = sizeof(perf_mod_e);
 	}
 
-	if (options->op_type ==	CPERF_PDCP) {
+	if (options->op_type ==	CPERF_PDCP ||
+			options->op_type == CPERF_IPSEC) {
 		if (options->cipher_algo == RTE_CRYPTO_CIPHER_NULL) {
 			t_vec->cipher_key.length = 0;
 			t_vec->ciphertext.data = plaintext;
diff a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c	(rejected hunks)
@@ -41,6 +41,7 @@ const char *cperf_op_type_strs[] = {
 	[CPERF_AEAD] = "aead",
 	[CPERF_PDCP] = "pdcp",
 	[CPERF_DOCSIS] = "docsis",
+	[CPERF_IPSEC] = "ipsec",
 	[CPERF_ASYM_MODEX] = "modex"
 };
 
@@ -278,9 +279,9 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
 			/* Fall through */
 		case CPERF_PDCP:
 		case CPERF_DOCSIS:
+		case CPERF_IPSEC:
 			/* Fall through */
 		default:
-
 			conf.ff_disable |= RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO;
 		}
 

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

UNH-IOL DPDK Community Lab