|WARNING| pw116867-116868 [PATCH] [2/2] crypto/armv8: adapt to updated sym session framework

|WARNING| pw116867-116868 [PATCH] [2/2] crypto/armv8: adapt to updated sym session framework

[dpdklab]

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

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

_apply patch failure_

Submitter: Ruifeng Wang <ruifeng.wang@arm.com>
Date: Monday, September 26 2022 10:01:20 
Applied on: CommitID:abea8974c7a6647585596348245ed7011d0a5104
Apply patch set 116867-116868 failed:

Checking patch app/test/test_cryptodev.c...
error: while searching for:
	ut_params->auth_xform.auth.key.data = hmac_sha1_key;
	ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA1;

	ut_params->sess = rte_cryptodev_sym_session_create(
			ts_params->valid_devs[0], &ut_params->cipher_xform,
			ts_params->session_mpool);

error: patch failed: app/test/test_cryptodev.c:2176
Applying patch app/test/test_cryptodev.c with 1 reject...
Rejected hunk #1.
diff a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c	(rejected hunks)
@@ -2176,6 +2176,7 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
 	ut_params->auth_xform.auth.key.data = hmac_sha1_key;
 	ut_params->auth_xform.auth.digest_length = DIGEST_BYTE_LENGTH_SHA1;
 
+	rte_errno = 0;
 	ut_params->sess = rte_cryptodev_sym_session_create(
 			ts_params->valid_devs[0], &ut_params->cipher_xform,
 			ts_params->session_mpool);
Checking patch drivers/crypto/armv8/armv8_pmd_private.h...
Checking patch drivers/crypto/armv8/rte_armv8_pmd.c...
error: while searching for:
	if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
		/* get existing session */
		if (likely(op->sym->session != NULL)) {
			sess = op->sym->session->data;
		}
	} else {
		/* provide internal session */

error: patch failed: drivers/crypto/armv8/rte_armv8_pmd.c:521
error: while searching for:
		if (rte_mempool_get(qp->sess_mp, (void **)&_sess))
			return NULL;

		sess = (struct armv8_crypto_session *)_sess->data;

		if (unlikely(armv8_crypto_set_session_parameters(sess,
				op->sym->xform) != 0)) {

error: patch failed: drivers/crypto/armv8/rte_armv8_pmd.c:530
Checking patch drivers/crypto/armv8/rte_armv8_pmd_ops.c...
error: while searching for:

/** Configure the session from a crypto xform chain */
static int
armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev,
		struct rte_crypto_sym_xform *xform,
		struct rte_cryptodev_sym_session *sess)
{

error: patch failed: drivers/crypto/armv8/rte_armv8_pmd_ops.c:265
error: while searching for:
		return -EINVAL;
	}

	sess_private_data = sess->data;

	ret = armv8_crypto_set_session_parameters(sess_private_data, xform);
	if (ret != 0) {

error: patch failed: drivers/crypto/armv8/rte_armv8_pmd_ops.c:277
Applied patch drivers/crypto/armv8/armv8_pmd_private.h cleanly.
Applying patch drivers/crypto/armv8/rte_armv8_pmd.c with 2 rejects...
Rejected hunk #1.
Rejected hunk #2.
Applying patch drivers/crypto/armv8/rte_armv8_pmd_ops.c with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
diff a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c	(rejected hunks)
@@ -521,7 +521,7 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op)
 	if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
 		/* get existing session */
 		if (likely(op->sym->session != NULL)) {
-			sess = op->sym->session->data;
+			sess = CRYPTODEV_GET_SYM_SESS_PRIV(op->sym->session);
 		}
 	} else {
 		/* provide internal session */
@@ -530,7 +530,7 @@ get_session(struct armv8_crypto_qp *qp, struct rte_crypto_op *op)
 		if (rte_mempool_get(qp->sess_mp, (void **)&_sess))
 			return NULL;
 
-		sess = (struct armv8_crypto_session *)_sess->data;
+		sess = (struct armv8_crypto_session *)_sess->driver_priv_data;
 
 		if (unlikely(armv8_crypto_set_session_parameters(sess,
 				op->sym->xform) != 0)) {
diff a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c	(rejected hunks)
@@ -265,7 +264,7 @@ armv8_crypto_pmd_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
 
 /** Configure the session from a crypto xform chain */
 static int
-armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev,
+armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev __rte_unused,
 		struct rte_crypto_sym_xform *xform,
 		struct rte_cryptodev_sym_session *sess)
 {
@@ -277,7 +276,7 @@ armv8_crypto_pmd_sym_session_configure(struct rte_cryptodev *dev,
 		return -EINVAL;
 	}
 
-	sess_private_data = sess->data;
+	sess_private_data = sess->driver_priv_data;
 
 	ret = armv8_crypto_set_session_parameters(sess_private_data, xform);
 	if (ret != 0) {

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

UNH-IOL DPDK Community Lab