crypto/qat: fix process type handling
This patch fix the process type handling in QAT PMDs where only primary and secondary process are supported in qat build request
--- 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(-)
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +3 -0
@@ -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)
drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c +3 -0
@@ -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)
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c +3 -0
@@ -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) {
drivers/crypto/qat/qat_sym.c +4 -4
@@ -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
Quoted 18 lines · Kai Ji
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 <[email protected]>--- 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(-)drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +0
-0
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c qat_sym_crypto_set_session_gen3(void *cdev __rte_unused, void *session) · line 362
Quoted 5 lines
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +2
-0@@ -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 ;
This is not supposed to happen after rte_eal_init() is called.
I have a doubt on Windows init because I can't see where rte_config.process_type is initialised.
Are you seeing this issue on Windows?
In any case, the commitlog needs more explanation.
Signature · 1 line
David Marchand
Hi
Quoted 11 lines
This is not supposed to happen after
rte_eal_init()is called.I have a doubt on Windows init because I can't see where rte_config.process_type is initialised.
Are you seeing this issue on Windows?In any case, the commitlog needs more explanation.
--
David Marchand
The process type should be either Primary or Secondary after the rte_eal_init(), This check mainly fix of Memory corruptions issue reported by Coverity. I will update the commitlog of more info
Regards
Kai
PATCH v2 1/1 crypto/qat: fix process type handling
In reply to Kai JiThis patch fix the memory corruptions issue reported by coverity. The process type handling in QAT PMDs where only primary and secondary process are supported in qat build request.
Coverity issue: 376551, 376570, 376534
--- 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(-)
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c +3 -0
@@ -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 ==RTE_PROC_AUTO || 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)
drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c +3 -0
@@ -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 ==RTE_PROC_AUTO || 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)
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c +3 -0
@@ -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 ==RTE_PROC_AUTO || 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) {
drivers/crypto/qat/qat_sym.c +4 -4
@@ -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 ==RTE_PROC_AUTO || 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 =
Signature · 1 line
2.17.1
Akhil Goyal
AppliedQuoted 9 lines
This patch fix the memory corruptions issue reported by coverity. The process type handling in QAT PMDs where only primary and secondary process are supported in qat build request.
Coverity issue: 376551, 376570, 376534
Fixes b62d00d0d247 ("crypto/qat: rework burst data path")Signed-off-by Kai Ji <[email protected]>
Applied to dpdk-next-crypto