crypto/qat: fix of cipher offset and length assignment

PATCH Superseded Kai Ji 4 participants 5 messages Mar 25, 2022 – May 26, 2022 Crypto API

lore

Share & tools

lore

Kai Ji

author

2022-03-25 11:22 UTC #0 lore raw

PATCH 1/1 crypto/qat: fix of cipher offset and length assignment

This patch fix the cipher offset and length values when convert mbuf to vector chain for QAT build op.

Fixes a815a04cea05 ("crypto/qat: support symmetric build op request")

Signed-off-by Kai Ji <[email protected]>

---
 drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +6 -6

index 50a9c5ad5b..dc473e0624 100644
@@ -395,12 +395,12 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 	ret = qat_cipher_is_len_in_bits(ctx, op);
 	switch (ret) {
 	case 1:
-		cipher_len = op->sym->aead.data.length >> 3;
-		cipher_ofs = op->sym->aead.data.offset >> 3;
+		cipher_len = op->sym->cipher.data.length >> 3;
+		cipher_ofs = op->sym->cipher.data.offset >> 3;
 		break;
 	case 0:
-		cipher_len = op->sym->aead.data.length;
-		cipher_ofs = op->sym->aead.data.offset;
+		cipher_len = op->sym->cipher.data.length;
+		cipher_ofs = op->sym->cipher.data.offset;
 		break;
 	default:
 		QAT_DP_LOG(ERR,

@@ -426,7 +426,6 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 		return -EINVAL;
 	}
 
-	min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;
 	max_len = RTE_MAX(cipher_ofs + cipher_len, auth_ofs + auth_len);
 
 	/* digest in buffer check. Needed only for wireless algos */

@@ -463,7 +462,8 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 					ctx->digest_length);
 	}
 
-	n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, min_ofs, max_len,
+	/* Passing 0 as cipher & auth offsets are assigned into ofs later */
+	n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, 0, max_len,
 			in_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
 	if (unlikely(n_src < 0 || n_src > op->sym->m_src->nb_segs)) {
 		op->status = RTE_CRYPTO_OP_STATUS_ERROR;

Signature · 1 line

2.17.1

Kai Ji

author

2022-04-06 13:45 UTC #1 lore raw

PATCH v2 1/1 crypto/qat: fix of offset and length assignment

This patch fix the cipher & auth offset and length values when convert mbuf to vector chain for QAT build op.

Fixes a815a04cea05 ("crypto/qat: support symmetric build op request")

Signed-off-by Kai Ji <[email protected]>

---
 drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +10 ~~-10~~

index 50a9c5ad5b..9e01755fd9 100644
@@ -330,7 +330,7 @@ qat_sym_convert_op_to_vec_auth(struct rte_crypto_op *op,
 	}
 
 	n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, auth_ofs,
-			auth_ofs + auth_len, in_sgl->vec,
+			auth_len, in_sgl->vec,
 			QAT_SYM_SGL_MAX_NUMBER);
 	if (n_src < 0 || n_src > op->sym->m_src->nb_segs) {
 		op->status = RTE_CRYPTO_OP_STATUS_ERROR;

@@ -343,7 +343,7 @@ qat_sym_convert_op_to_vec_auth(struct rte_crypto_op *op,
 	if (unlikely((op->sym->m_dst != NULL) &&
 			(op->sym->m_dst != op->sym->m_src))) {
 		int n_dst = rte_crypto_mbuf_to_vec(op->sym->m_dst, auth_ofs,
-				auth_ofs + auth_len, out_sgl->vec,
+				auth_len, out_sgl->vec,
 				QAT_SYM_SGL_MAX_NUMBER);
 
 		if ((n_dst < 0) || (n_dst > op->sym->m_dst->nb_segs)) {

@@ -369,7 +369,7 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 		struct rte_crypto_va_iova_ptr *digest)
 {
 	union rte_crypto_sym_ofs ofs;
-	uint32_t min_ofs = 0, max_len = 0;
+	uint32_t max_len = 0;
 	uint32_t cipher_len = 0, cipher_ofs = 0;
 	uint32_t auth_len = 0, auth_ofs = 0;
 	int is_oop = (op->sym->m_dst != NULL) &&

@@ -395,12 +395,12 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 	ret = qat_cipher_is_len_in_bits(ctx, op);
 	switch (ret) {
 	case 1:
-		cipher_len = op->sym->aead.data.length >> 3;
-		cipher_ofs = op->sym->aead.data.offset >> 3;
+		cipher_len = op->sym->cipher.data.length >> 3;
+		cipher_ofs = op->sym->cipher.data.offset >> 3;
 		break;
 	case 0:
-		cipher_len = op->sym->aead.data.length;
-		cipher_ofs = op->sym->aead.data.offset;
+		cipher_len = op->sym->cipher.data.length;
+		cipher_ofs = op->sym->cipher.data.offset;
 		break;
 	default:
 		QAT_DP_LOG(ERR,

@@ -426,7 +426,6 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 		return -EINVAL;
 	}
 
-	min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;
 	max_len = RTE_MAX(cipher_ofs + cipher_len, auth_ofs + auth_len);
 
 	/* digest in buffer check. Needed only for wireless algos */

@@ -463,7 +462,8 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 					ctx->digest_length);
 	}
 
-	n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, min_ofs, max_len,
+	/* Passing 0 as cipher & auth offsets are assigned into ofs later */
+	n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, 0, max_len,
 			in_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
 	if (unlikely(n_src < 0 || n_src > op->sym->m_src->nb_segs)) {
 		op->status = RTE_CRYPTO_OP_STATUS_ERROR;

@@ -473,7 +473,7 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 
 	if (unlikely((op->sym->m_dst != NULL) &&
 			(op->sym->m_dst != op->sym->m_src))) {
-		int n_dst = rte_crypto_mbuf_to_vec(op->sym->m_dst, min_ofs,
+		int n_dst = rte_crypto_mbuf_to_vec(op->sym->m_dst, 0,
 				max_len, out_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
 
 		if (n_dst < 0 || n_dst > op->sym->m_dst->nb_segs) {

Signature · 1 line

2.17.1

Zhang, Roy Fan

Acked-by on v2 1/1

2022-05-26 08:34 UTC #2 lore raw

RE: [dpdk-dev v2] crypto/qat: fix of offset and length assignment

Quoted 7 lines

-----Original Message-----
From: Kai Ji <[email protected]>
Sent: Wednesday, April 6, 2022 2:45 PM
To: [email protected]
Cc: [email protected]; Ji, Kai <[email protected]>
Subject: [dpdk-dev v2] crypto/qat: fix of offset and length assignment

Quoted 7 lines

This patch fix the cipher & auth offset and length values when convert mbuf to vector chain for QAT build op.
Fixes a815a04cea05 ("crypto/qat: support symmetric build op request")
Signed-off-by Kai Ji <[email protected]>
---

Acked-by Fan Zhang <[email protected]>

Akhil Goyal

Applied

2022-05-26 16:28 UTC #3 lore raw

RE: [dpdk-dev v2] crypto/qat: fix of offset and length assignment

Quoted 9 lines

Quoted 8 lines
This patch fix the cipher & auth offset and length values when convert mbuf to vector chain for QAT build op.
Fixes a815a04cea05 ("crypto/qat: support symmetric build op request")
Signed-off-by Kai Ji <[email protected]>
---
Acked-by Fan Zhang <[email protected]>

Applied to dpdk-next-crypto

Thanks

Poczatek, Jakub

Tested-by on v1 1/1

2022-05-23 13:42 UTC #4 lore raw

In reply to Kai Ji

Hey everyone,

Tested-by Jakub Poczatek <[email protected]>

-----Original Message-----
From: Kai Ji <[email protected]>
Sent: Friday 25 March 2022 11:22
To: [email protected]
Cc: [email protected]; Ji, Kai <[email protected]>
Subject: [dpdk-dev v1] crypto/qat: fix of cipher offset and length assignment

This patch fix the cipher offset and length values when convert mbuf to vector chain for QAT build op.

Fixes a815a04cea05 ("crypto/qat: support symmetric build op request")

Signed-off-by Kai Ji <[email protected]>

---
 drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +4 -5

index 50a9c5ad5b..dc473e0624 100644
@@ -395,12 +395,12 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 	ret = qat_cipher_is_len_in_bits(ctx, op);
 	switch (ret) {
 	case 1:
-		cipher_len = op->sym->aead.data.length >> 3;
-		cipher_ofs = op->sym->aead.data.offset >> 3;
+		cipher_len = op->sym->cipher.data.length >> 3;
+		cipher_ofs = op->sym->cipher.data.offset >> 3;
 		break;
 	case 0:
-		cipher_len = op->sym->aead.data.length;
-		cipher_ofs = op->sym->aead.data.offset;
+		cipher_len = op->sym->cipher.data.length;
+		cipher_ofs = op->sym->cipher.data.offset;
 		break;
 	default:
 		QAT_DP_LOG(ERR,

@@ -426,7 +426,6 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,
 		return -EINVAL;
 	}
 
-	min_ofs = cipher_ofs < auth_ofs ? cipher_ofs : auth_ofs;
 	max_len = RTE_MAX(cipher_ofs + cipher_len, auth_ofs + auth_len);
 
 	/* digest in buffer check. Needed only for wireless algos */ @@ -463,7 +462,8 @@ qat_sym_convert_op_to_vec_chain(struct rte_crypto_op *op,

ctx->digest_length);
}

- n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, min_ofs, max_len,
+ /* Passing 0 as cipher & auth offsets are assigned into ofs later */
+ n_src = rte_crypto_mbuf_to_vec(op->sym->m_src, 0, max_len,
in_sgl->vec, QAT_SYM_SGL_MAX_NUMBER);
if (unlikely(n_src < 0 || n_src > op->sym->m_src->nb_segs)) {
op->status = RTE_CRYPTO_OP_STATUS_ERROR;
--
2.17.1