crypto/mvsam: fix build for session rework

Message ID 20221006082228.91120-1-gakhil@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series crypto/mvsam: fix build for session rework |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-x86_64-unit-testing fail Testing issues
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS

Commit Message

Akhil Goyal Oct. 6, 2022, 8:22 a.m. UTC
  mvsam build was broken due to the recent session rework,
as it was not enabled in default build.
This patch fixes the build.

Fixes: 3f3fc3308bd0 ("security: remove private mempool usage")
Fixes: bdce2564dbf7 ("cryptodev: rework session framework")
Fixes: 66837861d375 ("drivers/crypto: support security session size query")

Signed-off-by: Akhil Goyal <gakhil@marvell.com>
---
 drivers/crypto/mvsam/rte_mrvl_pmd.c     | 2 +-
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
  

Comments

Thomas Monjalon Oct. 6, 2022, 10:14 a.m. UTC | #1
06/10/2022 10:22, Akhil Goyal:
> mvsam build was broken due to the recent session rework,
> as it was not enabled in default build.
> This patch fixes the build.
> 
> Fixes: 3f3fc3308bd0 ("security: remove private mempool usage")
> Fixes: bdce2564dbf7 ("cryptodev: rework session framework")
> Fixes: 66837861d375 ("drivers/crypto: support security session size query")
> 
> Signed-off-by: Akhil Goyal <gakhil@marvell.com>

Applied, thanks.
  

Patch

diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 88651b9a55..1641da9ca6 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -767,7 +767,7 @@  mrvl_request_prepare_sec(struct sam_cio_ipsec_params *request,
 		return -EINVAL;
 	}
 
-	sess = SECURITY_GET_SESS_PRIV(op->sym->sec_session);
+	sess = SECURITY_GET_SESS_PRIV(op->sym->session);
 	if (unlikely(sess == NULL)) {
 		MRVL_LOG(ERR, "Session was not created for this device! %d",
 			 cryptodev_driver_id);
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 6ac0407c36..5a0658cf83 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -704,7 +704,6 @@  mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 			break;
 
 		qp->sess_mp = qp_conf->mp_session;
-		qp->sess_mp_priv = qp_conf->mp_session_private;
 
 		memset(&qp->stats, 0, sizeof(qp->stats));
 		dev->data->queue_pairs[qp_id] = qp;
@@ -778,11 +777,11 @@  mrvl_crypto_pmd_sym_session_configure(__rte_unused struct rte_cryptodev *dev,
  * @returns 0. Always.
  */
 static void
-mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev,
+mrvl_crypto_pmd_sym_session_clear(struct rte_cryptodev *dev __rte_unused,
 		struct rte_cryptodev_sym_session *sess)
 {
 
-	void *sess_priv = sess->data;
+	void *sess_priv = sess->driver_priv_data;
 
 	/* Zero out the whole structure */
 	if (sess_priv) {
@@ -908,7 +907,7 @@  mrvl_crypto_pmd_security_session_destroy(void *dev __rte_unused,
 }
 
 static unsigned int
-mrvl_crypto_pmd_security_session_create(void *device __rte_unused)
+mrvl_crypto_pmd_security_session_get_size(void *device __rte_unused)
 {
 	return sizeof(struct mrvl_crypto_session);
 }