crypto/qat: reallocate on openssl version check
PATCH 1/1 crypto/qat: reallocate on openssl version check
This patch reallocates the openssl version check from qat_session_configure() to a proper qat_security_session_create() routine
--- drivers/crypto/qat/qat_sym_session.c | 31 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/crypto/qat/qat_sym_session.c +20 -11
@@ -537,8 +537,19 @@ qat_sym_session_configure(struct rte_cryptodev *dev, }#if (OPENSSL_VERSION_NUMBER >=0x30000000L ) -if (ossl_legacy_provider_load ()) -return -EINVAL ; +OSSL_PROVIDER * legacy; +OSSL_PROVIDER *deflt; + +/* Load Multiple providers into the default (NULL) library context */ + legacy =OSSL_PROVIDER_load (NULL ,"legacy" ); +if (legacy ==NULL ) +return -EINVAL ; + + deflt =OSSL_PROVIDER_load (NULL ,"default" ); +if (deflt ==NULL ) { +OSSL_PROVIDER_unload (legacy); +return -EINVAL ; + }#endif ret =qat_sym_session_set_parameters (dev, xform, sess_private_data);if (ret !=0 ) {
@@ -554,7 +565,8 @@ qat_sym_session_configure(struct rte_cryptodev *dev, sess_private_data);# if (OPENSSL_VERSION_NUMBER >=0x30000000L ) -ossl_legacy_provider_unload (); +OSSL_PROVIDER_unload (legacy); +OSSL_PROVIDER_unload (deflt);# endif return 0 ; }
@@ -2594,8 +2606,11 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev, {int ret;int qat_cmd_id; +struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev;struct rte_crypto_sym_xform *xform =NULL ;struct qat_sym_session *session = session_private; +struct qat_cryptodev_private *internals = cdev->data->dev_private; +enum qat_device_gen qat_dev_gen = internals->qat_dev->qat_dev_gen;/* Clear the session */ memset (session,0 ,qat_sym_session_get_private_size (dev));
@@ -2633,7 +2648,7 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev,return ret;qat_sym_session_finalize (session); -return 0 ; +return qat_sym_gen_dev_ops[qat_dev_gen].set_session ((void *)cdev, session); }int
@@ -2644,9 +2659,6 @@ qat_security_session_create(void *dev, {void *sess_private_data;struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev; -struct qat_cryptodev_private *internals = cdev->data->dev_private; -enum qat_device_gen qat_dev_gen = internals->qat_dev->qat_dev_gen; -struct qat_sym_session *sym_session =NULL ;int ret; if (conf->action_type != RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ||
@@ -2674,11 +2686,8 @@ qat_security_session_create(void *dev, }set_sec_session_private_data (sess, sess_private_data); - sym_session = (struct qat_sym_session *)sess_private_data; - sym_session->dev_id = internals->dev_id; -return qat_sym_gen_dev_ops[qat_dev_gen].set_session ((void *)cdev, - sess_private_data); +return 0 ; }int
Signature · 1 line
2.25.1
Quoted 9 lines
This patch reallocates the openssl version check from
qat_session_configure()to a properqat_security_session_create()routineFixes 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")Signed-off-by Brian Dooley <[email protected]>---
Please rebase.
Please rebase
Quoted 17 lines
-----Original Message-----
From: Dooley, Brian <[email protected]>
Sent: Monday, October 3, 2022 4:27 PM
To: Ji, Kai <[email protected]>
Cc: [email protected]; [email protected]; Dooley, Brian <[email protected]>
Subject: [PATCH v1]crypto/qat: reallocate on openssl version checkThis patch reallocates the openssl version check from
qat_session_configure()to a properqat_security_session_create()routineFixes 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash andAES")
Cc: [email protected]Signed-off-by Brian Dooley <[email protected]>---
PATCH v2 1/1 crypto/qat: reallocate on openssl version check
In reply to Brian DooleyThis patch reallocates the openssl version check from qat_session_configure() to a proper qat_security_session_create() routine
---
v2: rebase on main
--- drivers/crypto/qat/qat_sym_session.c | 32 +++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/crypto/qat/qat_sym_session.c +20 -12
@@ -520,8 +520,19 @@ qat_sym_session_configure(struct rte_cryptodev *dev,int ret;#if (OPENSSL_VERSION_NUMBER >=0x30000000L ) -if (ossl_legacy_provider_load ()) -return -EINVAL ; +OSSL_PROVIDER * legacy; +OSSL_PROVIDER *deflt; + +/* Load Multiple providers into the default (NULL) library context */ + legacy =OSSL_PROVIDER_load (NULL ,"legacy" ); +if (legacy ==NULL ) +return -EINVAL ; + + deflt =OSSL_PROVIDER_load (NULL ,"default" ); +if (deflt ==NULL ) { +OSSL_PROVIDER_unload (legacy); +return -EINVAL ; + }#endif ret = qat_sym_session_set_parameters(dev, xform, CRYPTODEV_GET_SYM_SESS_PRIV(sess),
@@ -534,7 +545,8 @@ qat_sym_session_configure(struct rte_cryptodev *dev, }# if (OPENSSL_VERSION_NUMBER >=0x30000000L ) -ossl_legacy_provider_unload (); +OSSL_PROVIDER_unload (legacy); +OSSL_PROVIDER_unload (deflt);# endif return 0 ; }
@@ -2575,8 +2587,11 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev, {int ret;int qat_cmd_id; +struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev;struct rte_crypto_sym_xform *xform =NULL ;struct qat_sym_session *session = session_private; +struct qat_cryptodev_private *internals = cdev->data->dev_private; +enum qat_device_gen qat_dev_gen = internals->qat_dev->qat_dev_gen;/* Clear the session */ memset (session,0 ,qat_sym_session_get_private_size (dev));
@@ -2613,7 +2628,7 @@ qat_sec_session_set_docsis_parameters(struct rte_cryptodev *dev,return ret;qat_sym_session_finalize (session); -return 0 ; +return qat_sym_gen_dev_ops[qat_dev_gen].set_session ((void *)cdev, session); }int
@@ -2623,9 +2638,6 @@ qat_security_session_create(void *dev, {void *sess_private_data =SECURITY_GET_SESS_PRIV (sess);struct rte_cryptodev *cdev = (struct rte_cryptodev *)dev; -struct qat_cryptodev_private *internals = cdev->data->dev_private; -enum qat_device_gen qat_dev_gen = internals->qat_dev->qat_dev_gen; -struct qat_sym_session *sym_session =NULL ;int ret; if (conf->action_type != RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL ||
@@ -2645,11 +2657,7 @@ qat_security_session_create(void *dev,return ret; } - sym_session = (struct qat_sym_session *)sess_private_data; - sym_session->dev_id = internals->dev_id; - -return qat_sym_gen_dev_ops[qat_dev_gen].set_session ((void *)cdev, - sess_private_data); +return 0 ; }int
Signature · 1 line
2.25.1
Akhil Goyal
AppliedQuoted 10 lines
This patch reallocates the openssl version check from
qat_session_configure()to a properqat_security_session_create()routineFixes 3227bc7138f5 ("crypto/qat: use intel-ipsec-mb for partial hash and AES")Signed-off-by Brian Dooley <[email protected]>---
v2: rebase on main
Applied to dpdk-next-crypto
Thanks.