From: Kai Ji <kai.ji@intel.com>
To: dev@dpdk.org
Cc: roy.fan.zhang@intel.com, gakhil@marvell.com, Kai Ji <kai.ji@intel.com>
Subject: [dpdk-dev] crypto/qat: fix process type handling
Date: Tue, 1 Mar 2022 01:36:39 +0800 [thread overview]
Message-ID: <20220228173639.51393-1-kai.ji@intel.com> (raw)
This patch fix the process type handling in QAT PMDs where
only primary and secondary process are supported in qat
build request
Signed-off-by: Kai Ji <kai.ji@intel.com>
---
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 3 +++
drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 3 +++
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c | 3 +++
drivers/crypto/qat/qat_sym.c | 8 ++++----
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
index 5084a5fcd1..739404b1d4 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
@@ -358,6 +358,9 @@ qat_sym_crypto_set_session_gen3(void *cdev __rte_unused, void *session)
enum rte_proc_type_t proc_type = rte_eal_process_type();
int ret;
+ if (proc_type < 0 || proc_type == RTE_PROC_INVALID)
+ return -EINVAL;
+
ret = qat_sym_crypto_set_session_gen1(cdev, session);
/* special single pass build request for GEN3 */
if (ctx->is_single_pass)
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
index bd7f3785df..586f3d0344 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
@@ -189,6 +189,9 @@ qat_sym_crypto_set_session_gen4(void *cdev, void *session)
enum rte_proc_type_t proc_type = rte_eal_process_type();
int ret;
+ if (proc_type < 0 || proc_type == RTE_PROC_INVALID)
+ return -EINVAL;
+
ret = qat_sym_crypto_set_session_gen1(cdev, session);
/* special single pass build request for GEN4 */
if (ctx->is_single_pass && ctx->is_ucs)
diff --git a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
index 3bcb53cf9f..857b5747db 100644
--- a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
+++ b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
@@ -1149,6 +1149,9 @@ qat_sym_crypto_set_session_gen1(void *cryptodev __rte_unused, void *session)
enum rte_proc_type_t proc_type = rte_eal_process_type();
int handle_mixed = 0;
+ if (proc_type < 0 || proc_type == RTE_PROC_INVALID)
+ return -EINVAL;
+
if ((ctx->qat_cmd == ICP_QAT_FW_LA_CMD_HASH_CIPHER ||
ctx->qat_cmd == ICP_QAT_FW_LA_CMD_CIPHER_HASH) &&
!ctx->is_gmac) {
diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 1ccffad5ab..d846cc9ac4 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -60,6 +60,10 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
uintptr_t build_request_p = (uintptr_t)opaque[1];
qat_sym_build_request_t build_request = (void *)build_request_p;
struct qat_sym_session *ctx = NULL;
+ enum rte_proc_type_t proc_type = rte_eal_process_type();
+
+ if (proc_type < 0 || proc_type == RTE_PROC_INVALID)
+ return -EINVAL;
if (likely(op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)) {
ctx = get_sym_session_private_data(op->sym->session,
@@ -71,11 +75,9 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
if (sess != (uintptr_t)ctx) {
struct rte_cryptodev *cdev;
struct qat_cryptodev_private *internals;
- enum rte_proc_type_t proc_type;
cdev = rte_cryptodev_pmd_get_dev(ctx->dev_id);
internals = cdev->data->dev_private;
- proc_type = rte_eal_process_type();
if (internals->qat_dev->qat_dev_gen != dev_gen) {
op->status =
@@ -105,7 +107,6 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
if ((void *)sess != (void *)op->sym->sec_session) {
struct rte_cryptodev *cdev;
struct qat_cryptodev_private *internals;
- enum rte_proc_type_t proc_type;
ctx = get_sec_session_private_data(
op->sym->sec_session);
@@ -130,7 +131,6 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
}
cdev = rte_cryptodev_pmd_get_dev(ctx->dev_id);
internals = cdev->data->dev_private;
- proc_type = rte_eal_process_type();
if (internals->qat_dev->qat_dev_gen != dev_gen) {
op->status =
--
2.30.2
next reply other threads:[~2022-02-28 17:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 17:36 Kai Ji [this message]
2022-03-01 8:00 ` David Marchand
2022-03-01 10:51 ` Ji, Kai
2022-03-01 15:02 ` [dpdk-dev v2] " Kai Ji
2022-03-04 10:29 ` [EXT] " 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=20220228173639.51393-1-kai.ji@intel.com \
--to=kai.ji@intel.com \
--cc=dev@dpdk.org \
--cc=gakhil@marvell.com \
--cc=roy.fan.zhang@intel.com \
/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).