[v2] crypto/octeontx2: fix sessionless code

Message ID 20200918134545.26983-1-adwivedi@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [v2] crypto/octeontx2: fix sessionless code |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK

Commit Message

Ankur Dwivedi Sept. 18, 2020, 1:45 p.m. UTC
  A temporary session is created for sessionless crypto operations.
rte_cryptodev_sym_session_create() should be used for creating the
temporary session as it initializes the session structure in the
correct way. Also the session should be set to 0 before freeing it.

Fixes: 17ac2a72191b ("crypto/octeontx2: add enqueue/dequeue ops")

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
v2:
* Use local variable to hold session size

 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
  

Comments

Akhil Goyal Sept. 22, 2020, 7:49 p.m. UTC | #1
> A temporary session is created for sessionless crypto operations.
> rte_cryptodev_sym_session_create() should be used for creating the
> temporary session as it initializes the session structure in the
> correct way. Also the session should be set to 0 before freeing it.
> 
> Fixes: 17ac2a72191b ("crypto/octeontx2: add enqueue/dequeue ops")
> 
> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
> ---
> v2:
> * Use local variable to hold session size

Please supersede your previous versions from the patchworks. It creates unnecessary confusion.

Applied to dpdk-next-crypto

Thanks.
  
Ankur Dwivedi Sept. 23, 2020, 5:07 a.m. UTC | #2
>-----Original Message-----
>From: Akhil Goyal <akhil.goyal@nxp.com>
>Sent: Wednesday, September 23, 2020 1:19 AM
>To: Ankur Dwivedi <adwivedi@marvell.com>; dev@dpdk.org
>Cc: Anoob Joseph <anoobj@marvell.com>; Tejasree Kondoj
><ktejasree@marvell.com>
>Subject: [EXT] RE: [PATCH v2] crypto/octeontx2: fix sessionless code
>
>External Email
>
>----------------------------------------------------------------------
>> A temporary session is created for sessionless crypto operations.
>> rte_cryptodev_sym_session_create() should be used for creating the
>> temporary session as it initializes the session structure in the
>> correct way. Also the session should be set to 0 before freeing it.
>>
>> Fixes: 17ac2a72191b ("crypto/octeontx2: add enqueue/dequeue ops")
>>
>> Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
>> ---
>> v2:
>> * Use local variable to hold session size
>
>Please supersede your previous versions from the patchworks. It creates
>unnecessary confusion.
Sorry for the confusion. I will supersede previous versions.
>
>Applied to dpdk-next-crypto
>
>Thanks.
  

Patch

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 9d51b17dd..707f92562 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -648,8 +648,8 @@  otx2_cpt_enqueue_sym_sessless(struct otx2_cpt_qp *qp, struct rte_crypto_op *op,
 	int ret;
 
 	/* Create temporary session */
-
-	if (rte_mempool_get(qp->sess_mp, (void **)&sess))
+	sess = rte_cryptodev_sym_session_create(qp->sess_mp);
+	if (sess == NULL)
 		return -ENOMEM;
 
 	ret = sym_session_configure(driver_id, sym_op->xform, sess,
@@ -866,6 +866,8 @@  static inline void
 otx2_cpt_dequeue_post_process(struct otx2_cpt_qp *qp, struct rte_crypto_op *cop,
 			      uintptr_t *rsp, uint8_t cc)
 {
+	unsigned int sz;
+
 	if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
 		if (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
 			if (likely(cc == OTX2_IPSEC_PO_CC_SUCCESS)) {
@@ -894,6 +896,9 @@  otx2_cpt_dequeue_post_process(struct otx2_cpt_qp *qp, struct rte_crypto_op *cop,
 		if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
 			sym_session_clear(otx2_cryptodev_driver_id,
 					  cop->sym->session);
+			sz = rte_cryptodev_sym_get_existing_header_session_size(
+					cop->sym->session);
+			memset(cop->sym->session, 0, sz);
 			rte_mempool_put(qp->sess_mp, cop->sym->session);
 			cop->sym->session = NULL;
 		}