[PATCH] crypto/qat: fix secure session check

[PATCH] crypto/qat: fix secure session check

[Rebecca Troy]

Currently when running the dpdk-perf-test with docsis
security sessions, a segmentation fault occurs. This
is due to the check being made that the session is not
equal to op->sym->sec_session. This check passes the
first time but on the second iteration fails and doesn't
create the build_request.

This commit fixes that error by getting the ctx first
from the private session data and then comparing ctx,
rather than op->sym->sec_session, with the sess.

Fixes: fb3b9f492205 ("crypto/qat: rework burst data path")
Cc: kai.ji@intel.com
Cc: stable@dpdk.org

Signed-off-by: Rebecca Troy <rebecca.troy@intel.com>
---
 drivers/crypto/qat/qat_sym.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 3477cd89ad..e5ae670b3a 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -105,16 +105,16 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 
 #ifdef RTE_LIB_SECURITY
 	else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
-		if ((void *)sess != (void *)op->sym->sec_session) {
-			struct rte_cryptodev *cdev;
-			struct qat_cryptodev_private *internals;
-
-			ctx = get_sec_session_private_data(
+		ctx = get_sec_session_private_data(
 					op->sym->sec_session);
 			if (unlikely(!ctx)) {
 				QAT_DP_LOG(ERR, "No session for this device");
 				return -EINVAL;
 			}
+		if (sess != (uintptr_t)ctx) {
+			struct rte_cryptodev *cdev;
+			struct qat_cryptodev_private *internals;
+
 			if (unlikely(ctx->bpi_ctx == NULL)) {
 				QAT_DP_LOG(ERR, "QAT PMD only supports security"
 						" operation requests for"
-- 
2.25.1

RE: [EXT] [PATCH] crypto/qat: fix secure session check

[Akhil Goyal]

> Currently when running the dpdk-perf-test with docsis
> security sessions, a segmentation fault occurs. This
> is due to the check being made that the session is not
> equal to op->sym->sec_session. This check passes the
> first time but on the second iteration fails and doesn't
> create the build_request.
> 
> This commit fixes that error by getting the ctx first
> from the private session data and then comparing ctx,
> rather than op->sym->sec_session, with the sess.
> 
> Fixes: fb3b9f492205 ("crypto/qat: rework burst data path")
> Cc: kai.ji@intel.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Rebecca Troy <rebecca.troy@intel.com>
> ---
>  drivers/crypto/qat/qat_sym.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
> index 3477cd89ad..e5ae670b3a 100644
> --- a/drivers/crypto/qat/qat_sym.c
> +++ b/drivers/crypto/qat/qat_sym.c
> @@ -105,16 +105,16 @@ qat_sym_build_request(void *in_op, uint8_t
> *out_msg,
> 
>  #ifdef RTE_LIB_SECURITY
>  	else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
> -		if ((void *)sess != (void *)op->sym->sec_session) {
> -			struct rte_cryptodev *cdev;
> -			struct qat_cryptodev_private *internals;
> -
> -			ctx = get_sec_session_private_data(
> +		ctx = get_sec_session_private_data(
>  					op->sym->sec_session);
>  			if (unlikely(!ctx)) {
>  				QAT_DP_LOG(ERR, "No session for this
> device");
>  				return -EINVAL;
>  			}
Fix formatting of above if check.

> +		if (sess != (uintptr_t)ctx) {
> +			struct rte_cryptodev *cdev;
> +			struct qat_cryptodev_private *internals;
> +
>  			if (unlikely(ctx->bpi_ctx == NULL)) {
>  				QAT_DP_LOG(ERR, "QAT PMD only supports
> security"
>  						" operation requests for"
> --
> 2.25.1

[dpdk-dev v2] crypto/qat: fix secure session check

[Kai Ji]

From: Rebecca Troy <rebecca.troy@intel.com>

Currently when running the dpdk-perf-test with docsis
security sessions, a segmentation fault occurs. This
is due to the check being made that the session is not
equal to op->sym->sec_session. This check passes the
first time but on the second iteration fails and doesn't
create the build_request.

This commit fixes that error by getting the ctx first
from the private session data and then comparing ctx,
rather than op->sym->sec_session, with the sess.

Fixes: fb3b9f492205 ("crypto/qat: rework burst data path")
Cc: stable@dpdk.org

Signed-off-by: Rebecca Troy <rebecca.troy@intel.com>
Signed-off-by: Kai Ji <kai.ji@intel.com>
---
 drivers/crypto/qat/qat_sym.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 3477cd89ad..db6316fbe9 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -105,16 +105,15 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 
 #ifdef RTE_LIB_SECURITY
 	else if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
-		if ((void *)sess != (void *)op->sym->sec_session) {
+		ctx = get_sec_session_private_data(op->sym->sec_session);
+		if (unlikely(!ctx)) {
+			QAT_DP_LOG(ERR, "No session for this device");
+			return -EINVAL;
+		}
+		if (sess != (uintptr_t)ctx) {
 			struct rte_cryptodev *cdev;
 			struct qat_cryptodev_private *internals;
 
-			ctx = get_sec_session_private_data(
-					op->sym->sec_session);
-			if (unlikely(!ctx)) {
-				QAT_DP_LOG(ERR, "No session for this device");
-				return -EINVAL;
-			}
 			if (unlikely(ctx->bpi_ctx == NULL)) {
 				QAT_DP_LOG(ERR, "QAT PMD only supports security"
 						" operation requests for"
-- 
2.17.1

RE: [EXT] [dpdk-dev v2] crypto/qat: fix secure session check

[Akhil Goyal]

> ----------------------------------------------------------------------
> From: Rebecca Troy <rebecca.troy@intel.com>
> 
> Currently when running the dpdk-perf-test with docsis
> security sessions, a segmentation fault occurs. This
> is due to the check being made that the session is not
> equal to op->sym->sec_session. This check passes the
> first time but on the second iteration fails and doesn't
> create the build_request.
> 
> This commit fixes that error by getting the ctx first
> from the private session data and then comparing ctx,
> rather than op->sym->sec_session, with the sess.
> 
> Fixes: fb3b9f492205 ("crypto/qat: rework burst data path")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Rebecca Troy <rebecca.troy@intel.com>
> Signed-off-by: Kai Ji <kai.ji@intel.com>
Applied to dpdk-next-crypto
Thanks.