From: "Ji, Kai" <kai.ji@intel.com>
To: "Dooley, Brian" <brian.dooley@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>,
"stable@dpdk.org" <stable@dpdk.org>,
"gakhil@marvell.com" <gakhil@marvell.com>,
"Coyle, David" <david.coyle@intel.com>,
"O'Sullivan, Kevin" <kevin.osullivan@intel.com>
Subject: RE: [PATCH v1] crypto/qat: fix reallocate OpenSSL version check
Date: Tue, 1 Nov 2022 17:04:00 +0000 [thread overview]
Message-ID: <SN6PR11MB3408C989EB6E8EC27850B77D81369@SN6PR11MB3408.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20221031174919.642522-1-brian.dooley@intel.com>
Please see my comments below, In addition, in qat_sym_session.c l.2642
return qat_sym_gen_dev_ops[qat_dev_gen].set_session((void *)cdev, session);
the session pointer should cast to (void *) or we can pass session_private directly.
Regards
Kai
> -----Original Message-----
> From: Dooley, Brian <brian.dooley@intel.com>
> Sent: Monday, October 31, 2022 5:49 PM
> To: Ji, Kai <kai.ji@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org; gakhil@marvell.com; Coyle, David
> <david.coyle@intel.com>; O'Sullivan, Kevin <kevin.osullivan@intel.com>;
> Dooley, Brian <brian.dooley@intel.com>
> Subject: [PATCH v1] crypto/qat: fix reallocate OpenSSL version check
>
> Move the ossl_legacy_provider_unload() into the right place for secure protocol
> for QAT. Remove unnecessary unload from session destroy.
>
> Fixes: 52d59b92b06d ("crypto/qat: enable OpenSSL legacy provider in session")
> Cc: kai.ji@intel.com
> CC: stable@dpdk.org
> Signed-off-by: Brian Dooley <brian.dooley@intel.com>
> ---
> drivers/crypto/qat/qat_sym_session.c | 32 ++++++++++++++--------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/crypto/qat/qat_sym_session.c
> b/drivers/crypto/qat/qat_sym_session.c
> index 71fa595031..6872531d67 100644
> --- a/drivers/crypto/qat/qat_sym_session.c
> +++ b/drivers/crypto/qat/qat_sym_session.c
> @@ -520,19 +520,19 @@ qat_sym_session_configure(struct rte_cryptodev
> *dev,
> int ret;
>
> #if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
> - OSSL_PROVIDER * legacy;
> - OSSL_PROVIDER *deflt;
> + 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;
> + /* 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;
> - }
> + deflt = OSSL_PROVIDER_load(NULL, "default");
> + if (deflt == NULL) {
> + OSSL_PROVIDER_unload(legacy);
> + return -EINVAL;
> + }
[KJ] please use ossl_legacy_provider_load() helper instead load legacy and default libs manually here.
> #endif
> ret = qat_sym_session_set_parameters(dev, xform,
> CRYPTODEV_GET_SYM_SESS_PRIV(sess),
> @@ -545,8 +545,8 @@ qat_sym_session_configure(struct rte_cryptodev *dev,
> }
>
> # if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
> - OSSL_PROVIDER_unload(legacy);
> - OSSL_PROVIDER_unload(deflt);
> + OSSL_PROVIDER_unload(legacy);
> + OSSL_PROVIDER_unload(deflt);
[KJ] you can use ossl_legacy_provider_unload() here
> # endif
> return 0;
> }
> @@ -2668,6 +2668,9 @@ qat_security_session_create(void *dev,
> return ret;
> }
>
> +#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
> + ossl_legacy_provider_unload();
> +#endif
> return 0;
> }
>
> @@ -2684,9 +2687,6 @@ qat_security_session_destroy(void *dev
> __rte_unused,
> memset(s, 0, qat_sym_session_get_private_size(dev));
> }
>
> -# if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
> - ossl_legacy_provider_unload();
> -# endif
> return 0;
> }
>
> --
> 2.25.1
next prev parent reply other threads:[~2022-11-01 17:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 17:49 Brian Dooley
2022-11-01 17:04 ` Ji, Kai [this message]
2022-11-02 9:54 ` [PATCH v2] " Brian Dooley
2022-11-02 23:30 ` Ji, Kai
2022-11-03 10:55 ` Akhil Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SN6PR11MB3408C989EB6E8EC27850B77D81369@SN6PR11MB3408.namprd11.prod.outlook.com \
--to=kai.ji@intel.com \
--cc=brian.dooley@intel.com \
--cc=david.coyle@intel.com \
--cc=dev@dpdk.org \
--cc=gakhil@marvell.com \
--cc=kevin.osullivan@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).