patch 'crypto/qat: fix raw API null algorithm digest' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:21:17 CEST 2023
Hi,
FYI, your patch has been queued to stable release 22.11.4
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/15/23. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=40ea03b5eaf1339200b0722a349b0896929aa25b
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 40ea03b5eaf1339200b0722a349b0896929aa25b Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Thu, 7 Sep 2023 15:35:53 +0000
Subject: [PATCH] crypto/qat: fix raw API null algorithm digest
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit d7d52b37e89132f07121323c449ac838e6448ae0 ]
QAT HW generates bytes of 0x00 digest, even when a digest of len 0 is
requested for NULL. This caused test failures when the test vector had
digest len 0, as the buffer has unexpected changed bytes.
By placing the digest into the cookie for NULL authentication,
the buffer remains unchanged as expected, and the digest
is placed to the side, as it won't be used anyway.
This fix was previously added for the main QAT code path, but it also
needs to be included for the raw API code path.
Fixes: db0e952a5c01 ("crypto/qat: add NULL capability")
Signed-off-by: Ciara Power <ciara.power at intel.com>
---
drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 19 ++++++++-
drivers/crypto/qat/dev/qat_sym_pmd_gen1.c | 41 +++++++++++++++++---
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
index 1f6f63c831..84d58accc7 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
@@ -605,6 +605,8 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
uint32_t tail = dp_ctx->tail;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest = digest;
req = (struct icp_qat_fw_la_bulk_req *)(
(uint8_t *)tx_queue->base_addr + tail);
@@ -618,7 +620,12 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
return -1;
- enqueue_one_auth_job_gen3(ctx, cookie, req, digest, auth_iv, ofs,
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ }
+
+ enqueue_one_auth_job_gen3(ctx, cookie, req, job_digest, auth_iv, ofs,
(uint32_t)data_len);
dp_ctx->tail = tail;
@@ -640,6 +647,8 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
uint32_t tail;
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest = NULL;
n = QAT_SYM_DP_GET_MAX_ENQ(qp, dp_ctx->cached_enqueue, vec->num);
if (unlikely(n == 0)) {
@@ -672,7 +681,13 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
break;
- enqueue_one_auth_job_gen3(ctx, cookie, req, &vec->digest[i],
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ } else
+ job_digest = &vec->digest[i];
+
+ enqueue_one_auth_job_gen3(ctx, cookie, req, job_digest,
&vec->auth_iv[i], ofs, (uint32_t)data_len);
tail = (tail + tx_queue->msg_size) & tx_queue->modulo_mask;
}
diff --git a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
index 2709b0ab04..888dea4ad9 100644
--- a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
+++ b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
@@ -607,6 +607,8 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
uint32_t tail = dp_ctx->tail;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest = digest;
req = (struct icp_qat_fw_la_bulk_req *)(
(uint8_t *)tx_queue->base_addr + tail);
@@ -620,8 +622,13 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
return -1;
- enqueue_one_auth_job_gen1(ctx, req, digest, auth_iv, ofs,
- (uint32_t)data_len);
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ }
+
+ enqueue_one_auth_job_gen1(ctx, req, job_digest, auth_iv, ofs,
+ (uint32_t)data_len);
dp_ctx->tail = tail;
dp_ctx->cached_enqueue++;
@@ -646,6 +653,8 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
uint32_t tail;
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest = NULL;
n = QAT_SYM_DP_GET_MAX_ENQ(qp, dp_ctx->cached_enqueue, vec->num);
if (unlikely(n == 0)) {
@@ -678,7 +687,14 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
break;
- enqueue_one_auth_job_gen1(ctx, req, &vec->digest[i],
+
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ } else
+ job_digest = &vec->digest[i];
+
+ enqueue_one_auth_job_gen1(ctx, req, job_digest,
&vec->auth_iv[i], ofs, (uint32_t)data_len);
tail = (tail + tx_queue->msg_size) & tx_queue->modulo_mask;
@@ -715,6 +731,8 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
uint32_t tail = dp_ctx->tail;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest = digest;
req = (struct icp_qat_fw_la_bulk_req *)(
(uint8_t *)tx_queue->base_addr + tail);
@@ -727,8 +745,13 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
return -1;
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ }
+
if (unlikely(enqueue_one_chain_job_gen1(ctx, req, data, n_data_vecs,
- NULL, 0, cipher_iv, digest, auth_iv, ofs,
+ NULL, 0, cipher_iv, job_digest, auth_iv, ofs,
(uint32_t)data_len)))
return -1;
@@ -756,6 +779,8 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
uint32_t tail;
struct icp_qat_fw_la_bulk_req *req;
int32_t data_len;
+ struct rte_crypto_va_iova_ptr null_digest;
+ struct rte_crypto_va_iova_ptr *job_digest;
n = QAT_SYM_DP_GET_MAX_ENQ(qp, dp_ctx->cached_enqueue, vec->num);
if (unlikely(n == 0)) {
@@ -789,10 +814,16 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
if (unlikely(data_len < 0))
break;
+ if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) {
+ null_digest.iova = cookie->digest_null_phys_addr;
+ job_digest = &null_digest;
+ } else
+ job_digest = &vec->digest[i];
+
if (unlikely(enqueue_one_chain_job_gen1(ctx, req,
vec->src_sgl[i].vec, vec->src_sgl[i].num,
NULL, 0,
- &vec->iv[i], &vec->digest[i],
+ &vec->iv[i], job_digest,
&vec->auth_iv[i], ofs, (uint32_t)data_len)))
break;
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:36.206129300 +0800
+++ 0048-crypto-qat-fix-raw-API-null-algorithm-digest.patch 2023-10-22 22:17:34.266723700 +0800
@@ -1 +1 @@
-From d7d52b37e89132f07121323c449ac838e6448ae0 Mon Sep 17 00:00:00 2001
+From 40ea03b5eaf1339200b0722a349b0896929aa25b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit d7d52b37e89132f07121323c449ac838e6448ae0 ]
@@ -18 +20,0 @@
-Cc: stable at dpdk.org
@@ -27 +29 @@
-index d25e1b2f3a..0a939161f9 100644
+index 1f6f63c831..84d58accc7 100644
@@ -30 +32 @@
-@@ -637,6 +637,8 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
+@@ -605,6 +605,8 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
@@ -39 +41 @@
-@@ -650,7 +652,12 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
+@@ -618,7 +620,12 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
@@ -53 +55 @@
-@@ -672,6 +679,8 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
+@@ -640,6 +647,8 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
@@ -62 +64 @@
-@@ -704,7 +713,13 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
+@@ -672,7 +681,13 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
@@ -78 +80 @@
-index 70938ba508..e4bcfa59e7 100644
+index 2709b0ab04..888dea4ad9 100644
@@ -81 +83 @@
-@@ -598,6 +598,8 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -607,6 +607,8 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -90 +92 @@
-@@ -611,8 +613,13 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -620,8 +622,13 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -106 +108 @@
-@@ -636,6 +643,8 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -646,6 +653,8 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -115 +117 @@
-@@ -668,7 +677,14 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -678,7 +687,14 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -131 +133 @@
-@@ -703,6 +719,8 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -715,6 +731,8 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -140 +142 @@
-@@ -715,8 +733,13 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -727,8 +745,13 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -155 +157 @@
-@@ -743,6 +766,8 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -756,6 +779,8 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
@@ -164 +166 @@
-@@ -776,10 +801,16 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
+@@ -789,10 +814,16 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
More information about the stable
mailing list