patches for DPDK stable branches
 help / color / mirror / Atom feed
From: "Ji, Kai" <kai.ji@intel.com>
To: "Nicolau, Radu" <radu.nicolau@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>, Fan Zhang <fanzhang.oss@gmail.com>
Subject: Re: [PATCH] crypto/qat: fix source buffer alignment
Date: Mon, 11 Aug 2025 09:40:53 +0000	[thread overview]
Message-ID: <DS0PR11MB745868D172453A9F1AA4DE0B8128A@DS0PR11MB7458.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20250806144832.3507786-1-radu.nicolau@intel.com>

[-- Attachment #1: Type: text/plain, Size: 14240 bytes --]

Acked-by: Kai Ji <kai.ji@intel.com>

________________________________
From: Nicolau, Radu <radu.nicolau@intel.com>
Sent: 06 August 2025 15:48
To: dev@dpdk.org <dev@dpdk.org>
Cc: Nicolau, Radu <radu.nicolau@intel.com>; stable@dpdk.org <stable@dpdk.org>; Ji, Kai <kai.ji@intel.com>; Fan Zhang <fanzhang.oss@gmail.com>
Subject: [PATCH] crypto/qat: fix source buffer alignment

Fix performance regression resulting from using non cache-aligned
source buffers when using cryptodev API.

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

Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
---
 drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c | 14 ++++++------
 drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c |  6 ++---
 drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 21 ++++++++++++++++-
 drivers/crypto/qat/dev/qat_sym_pmd_gen1.c    | 24 ++++++++++----------
 4 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
index 0dcb5a7cb4..c196cf3cdb 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen3.c
@@ -422,7 +422,7 @@ qat_sym_build_op_aead_gen3(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -466,7 +466,7 @@ qat_sym_build_op_auth_gen3(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -564,7 +564,7 @@ qat_sym_dp_enqueue_single_aead_gen3(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -623,7 +623,7 @@ qat_sym_dp_enqueue_aead_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0) || error)
@@ -677,7 +677,7 @@ qat_sym_dp_enqueue_single_auth_gen3(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -732,12 +732,12 @@ qat_sym_dp_enqueue_auth_jobs_gen3(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec, vec->src_sgl[i].num,
-                               vec->dest_sgl[i].vec, vec->dest_sgl[i].num);
+                               vec->dest_sgl[i].vec, vec->dest_sgl[i].num, NULL, NULL);
                 } else {
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0))
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
index 638da1a173..f42ce7c178 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gen4.c
@@ -219,7 +219,7 @@ qat_sym_build_op_aead_gen4(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(qat_req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -376,7 +376,7 @@ qat_sym_dp_enqueue_single_aead_gen4(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -435,7 +435,7 @@ qat_sym_dp_enqueue_aead_jobs_gen4(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0) || error)
diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
index 1f19c69f88..67dc889b50 100644
--- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
+++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h
@@ -430,7 +430,8 @@ static __rte_always_inline int32_t
 qat_sym_build_req_set_data(struct icp_qat_fw_la_bulk_req *req,
                 void *opaque, struct qat_sym_op_cookie *cookie,
                 struct rte_crypto_vec *src_vec, uint16_t n_src,
-               struct rte_crypto_vec *dst_vec, uint16_t n_dst)
+               struct rte_crypto_vec *dst_vec, uint16_t n_dst,
+               union rte_crypto_sym_ofs *ofs, struct rte_crypto_op *op)
 {
         struct qat_sgl *list;
         uint32_t i;
@@ -502,6 +503,24 @@ qat_sym_build_req_set_data(struct icp_qat_fw_la_bulk_req *req,
                         dst_data_start = src_data_start;
         }

+       /* For crypto API only try to align the in-place buffers*/
+       if (op != NULL && likely(n_dst == 0)) {
+               uint16_t offset = src_data_start & RTE_CACHE_LINE_MASK;
+               if (offset) {
+                       rte_iova_t buff_addr = rte_mbuf_iova_get(op->sym->m_src);
+                       /* make sure src_data_start is still within the buffer */
+                       if (src_data_start - offset >= buff_addr) {
+                               src_data_start -= offset;
+                               dst_data_start = src_data_start;
+                               ofs->ofs.auth.head += offset;
+                               ofs->ofs.cipher.head += offset;
+                               tl_src += offset;
+                               total_len_src = tl_src;
+                               total_len_dst = tl_src;
+                       }
+               }
+       }
+
         req->comn_mid.src_data_addr = src_data_start;
         req->comn_mid.dest_data_addr = dst_data_start;
         req->comn_mid.src_length = total_len_src;
diff --git a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
index 8cb85fd8df..6da0f6c645 100644
--- a/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
+++ b/drivers/crypto/qat/dev/qat_sym_pmd_gen1.c
@@ -242,7 +242,7 @@ qat_sym_build_op_cipher_gen1(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -294,7 +294,7 @@ qat_sym_build_op_auth_gen1(void *in_op, struct qat_sym_session *ctx,
                                 req->comn_hdr.serv_specif_flags, 0);

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -339,7 +339,7 @@ qat_sym_build_op_aead_gen1(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -384,7 +384,7 @@ qat_sym_build_op_chain_gen1(void *in_op, struct qat_sym_session *ctx,
         }

         total_len = qat_sym_build_req_set_data(req, in_op, cookie,
-                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num);
+                       in_sgl.vec, in_sgl.num, out_sgl.vec, out_sgl.num, &ofs, op);
         if (unlikely(total_len < 0)) {
                 op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
                 return -EINVAL;
@@ -512,7 +512,7 @@ qat_sym_dp_enqueue_single_cipher_gen1(void *qp_data, uint8_t *drv_ctx,
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);

         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -571,7 +571,7 @@ qat_sym_dp_enqueue_cipher_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0 || error))
@@ -623,7 +623,7 @@ qat_sym_dp_enqueue_single_auth_gen1(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -690,7 +690,7 @@ qat_sym_dp_enqueue_auth_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0 || error))
@@ -747,7 +747,7 @@ qat_sym_dp_enqueue_single_chain_gen1(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -815,7 +815,7 @@ qat_sym_dp_enqueue_chain_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0 || error))
@@ -877,7 +877,7 @@ qat_sym_dp_enqueue_single_aead_gen1(void *qp_data, uint8_t *drv_ctx,
         rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
         rte_prefetch0((uint8_t *)tx_queue->base_addr + tail);
         data_len = qat_sym_build_req_set_data(req, user_data, cookie,
-                       data, n_data_vecs, NULL, 0);
+                       data, n_data_vecs, NULL, 0, NULL, NULL);
         if (unlikely(data_len < 0))
                 return -1;

@@ -936,7 +936,7 @@ qat_sym_dp_enqueue_aead_jobs_gen1(void *qp_data, uint8_t *drv_ctx,
                         data_len = qat_sym_build_req_set_data(req,
                                 user_data[i], cookie,
                                 vec->src_sgl[i].vec,
-                               vec->src_sgl[i].num, NULL, 0);
+                               vec->src_sgl[i].num, NULL, 0, NULL, NULL);
                 }

                 if (unlikely(data_len < 0) || error)
--
2.50.1


[-- Attachment #2: Type: text/html, Size: 33123 bytes --]

      reply	other threads:[~2025-08-11  9:41 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-06 14:48 Radu Nicolau
2025-08-11  9:40 ` Ji, Kai [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DS0PR11MB745868D172453A9F1AA4DE0B8128A@DS0PR11MB7458.namprd11.prod.outlook.com \
    --to=kai.ji@intel.com \
    --cc=dev@dpdk.org \
    --cc=fanzhang.oss@gmail.com \
    --cc=radu.nicolau@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).