[PATCH 0/2] fixes after sym session rework

[PATCH 0/2] fixes after sym session rework

[Ruifeng Wang]

1. Updated armv8 crypto PMD to adapt to new sym session rework.
2. Fixed UT test case issue found when testing armv8 crypto PMD.

This patch set depends on the sym session framework rework series.
http://patches.dpdk.org/project/dpdk/cover/20220924163542.4159562-1-gakhil@marvell.com/

Depends-on: series-116923 ("crypto/security session framework rework")

Ruifeng Wang (2):
  test/crypto: fix unexpected test abort
  crypto/armv8: adapt to updated sym session framework

 app/test/test_cryptodev.c                | 1 +
 drivers/crypto/armv8/armv8_pmd_private.h | 2 --
 drivers/crypto/armv8/rte_armv8_pmd.c     | 4 ++--
 drivers/crypto/armv8/rte_armv8_pmd_ops.c | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

-- 
2.25.1

[PATCH 1/2] test/crypto: fix unexpected test abort

[Ruifeng Wang]

rte_cryptodev_sym_session_create now updates rte_errno. So rte_errno
should be reset before executing current test case. This prevents
current case from being aborted due to errno set by previous negative
case.

Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 app/test/test_cryptodev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index b77e14cb06..981db009b8 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -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);
-- 
2.25.1

[PATCH 2/2] crypto/armv8: adapt to updated sym session framework

[Ruifeng Wang]

Adapt to data structure changes.

Signed-off-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 drivers/crypto/armv8/armv8_pmd_private.h | 2 --
 drivers/crypto/armv8/rte_armv8_pmd.c     | 4 ++--
 drivers/crypto/armv8/rte_armv8_pmd_ops.c | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
index 75ddba79c1..41292d8851 100644
--- a/drivers/crypto/armv8/armv8_pmd_private.h
+++ b/drivers/crypto/armv8/armv8_pmd_private.h
@@ -106,8 +106,6 @@ struct armv8_crypto_qp {
 	/**< Ring for placing process packets */
 	struct rte_mempool *sess_mp;
 	/**< Session Mempool */
-	struct rte_mempool *sess_mp_priv;
-       /**< Session Private Data Mempool */
 	struct rte_cryptodev_stats stats;
 	/**< Queue pair statistics */
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index 75a95e3689..ebca5c09ee 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -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 --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
index 176bb9e6a0..c4964bc112 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c
@@ -244,7 +244,6 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 		goto qp_setup_cleanup;
 
 	qp->sess_mp = qp_conf->mp_session;
-	qp->sess_mp_priv = qp_conf->mp_session_private;
 
 	memset(&qp->stats, 0, sizeof(qp->stats));
 
@@ -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) {
-- 
2.25.1