<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div class="elementToProof" style="font-family: "IntelOne Text"; font-size: 10pt; color: rgb(0, 0, 0);">
Acked-by: Kai Ji <kai.ji@intel.com></div>
<div class="elementToProof" style="font-family: "IntelOne Text"; font-size: 10pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Radu Nicolau <radu.nicolau@intel.com><br>
<b>Sent:</b> 12 June 2025 11:14<br>
<b>To:</b> Ji, Kai <kai.ji@intel.com>; Kusztal, ArkadiuszX <arkadiuszx.kusztal@intel.com><br>
<b>Cc:</b> dev@dpdk.org <dev@dpdk.org>; Nicolau, Radu <radu.nicolau@intel.com>; stable@dpdk.org <stable@dpdk.org><br>
<b>Subject:</b> [PATCH] crypto/qat: fix out-of-place chain/cipher/auth headers</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Extend the original fix to gen3 and gen4 code.<br>
<br>
Fixes: 317d05f3721c ("crypto/qat: fix out-of-place chain/cipher/auth headers")<br>
Cc: arkadiuszx.kusztal@intel.com<br>
Cc: stable@dpdk.org<br>
<br>
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com><br>
---<br>
 drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 13 ++++++++-----<br>
 drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c | 13 ++++++++-----<br>
 2 files changed, 16 insertions(+), 10 deletions(-)<br>
<br>
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c<br>
index 478e766b97..428430882d 100644<br>
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c<br>
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c<br>
@@ -643,16 +643,19 @@ qat_sym_dp_enqueue_aead_jobs_gen3(void *qp_data, uint8_t *drv_ctx,<br>
         for (i = 0; i < n; i++) {<br>
                 struct qat_sym_op_cookie *cookie =<br>
                         qp->op_cookies[tail >> tx_queue->trailz];<br>
+               int error = 0;<br>
 <br>
                 req  = (struct icp_qat_fw_la_bulk_req *)(<br>
                         (uint8_t *)tx_queue->base_addr + tail);<br>
                 rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));<br>
 <br>
                 if (vec->dest_sgl) {<br>
-                       data_len = qat_sym_build_req_set_data(req,<br>
-                               user_data[i], cookie,<br>
-                               vec->src_sgl[i].vec, vec->src_sgl[i].num,<br>
-                               vec->dest_sgl[i].vec, vec->dest_sgl[i].num);<br>
+                       data_len = qat_reqs_mid_set(&error, req, cookie, user_data[i],<br>
+                                       &vec->src_sgl[i], &vec->dest_sgl[i], ofs);<br>
+                       /* In oop there is no offset, src/dst addresses are moved<br>
+                        * to avoid overwriting the dst header<br>
+                        */<br>
+                       ofs.ofs.cipher.head = 0;<br>
                 } else {<br>
                         data_len = qat_sym_build_req_set_data(req,<br>
                                 user_data[i], cookie,<br>
@@ -660,7 +663,7 @@ qat_sym_dp_enqueue_aead_jobs_gen3(void *qp_data, uint8_t *drv_ctx,<br>
                                 vec->src_sgl[i].num, NULL, 0);<br>
                 }<br>
 <br>
-               if (unlikely(data_len < 0))<br>
+               if (unlikely(data_len < 0) || error)<br>
                         break;<br>
 <br>
                 enqueue_one_aead_job_gen3(ctx, req, &vec->iv[i],<br>
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c<br>
index 6a5d6e78b9..638da1a173 100644<br>
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c<br>
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c<br>
@@ -418,16 +418,19 @@ qat_sym_dp_enqueue_aead_jobs_gen4(void *qp_data, uint8_t *drv_ctx,<br>
         for (i = 0; i < n; i++) {<br>
                 struct qat_sym_op_cookie *cookie =<br>
                         qp->op_cookies[tail >> tx_queue->trailz];<br>
+               int error = 0;<br>
 <br>
                 req  = (struct icp_qat_fw_la_bulk_req *)(<br>
                         (uint8_t *)tx_queue->base_addr + tail);<br>
                 rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));<br>
 <br>
                 if (vec->dest_sgl) {<br>
-                       data_len = qat_sym_build_req_set_data(req,<br>
-                               user_data[i], cookie,<br>
-                               vec->src_sgl[i].vec, vec->src_sgl[i].num,<br>
-                               vec->dest_sgl[i].vec, vec->dest_sgl[i].num);<br>
+                       data_len = qat_reqs_mid_set(&error, req, cookie, user_data[i],<br>
+                                       &vec->src_sgl[i], &vec->dest_sgl[i], ofs);<br>
+                       /* In oop there is no offset, src/dst addresses are moved<br>
+                        * to avoid overwriting the dst header<br>
+                        */<br>
+                       ofs.ofs.cipher.head = 0;<br>
                 } else {<br>
                         data_len = qat_sym_build_req_set_data(req,<br>
                                 user_data[i], cookie,<br>
@@ -435,7 +438,7 @@ qat_sym_dp_enqueue_aead_jobs_gen4(void *qp_data, uint8_t *drv_ctx,<br>
                                 vec->src_sgl[i].num, NULL, 0);<br>
                 }<br>
 <br>
-               if (unlikely(data_len < 0))<br>
+               if (unlikely(data_len < 0) || error)<br>
                         break;<br>
 <br>
                 enqueue_one_aead_job_gen4(ctx, req, &vec->iv[i],<br>
-- <br>
2.43.0<br>
<br>
</div>
</span></font></div>
</body>
</html>