patch 'crypto/cnxk: fix out-of-place AES-GCM' has been queued to stable release 24.11.7
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Mon Jul 6 12:20:07 CEST 2026
Hi,
FYI, your patch has been queued to stable release 24.11.7
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/05/26. 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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/32d04d621e3809f0a6764820e01a5c4c1c4b9eff
Thanks.
Luca Boccassi
---
>From 32d04d621e3809f0a6764820e01a5c4c1c4b9eff Mon Sep 17 00:00:00 2001
From: Daphne Priscilla <df at marvell.com>
Date: Fri, 12 Jun 2026 11:50:09 +0530
Subject: [PATCH] crypto/cnxk: fix out-of-place AES-GCM
[ upstream commit bd5d82a5a396ebca889973ff0665937c009964fa ]
For AES-GCM out of place, when AAD is present in inbuf before the data,
it is treated as passthrough data. This results in AAD being
present in outbuf header, but test expects outbuf header to remain
zero. Passthrough data is now diverted to metabuf so outbuf
header remains zero.
Fixes: 7c19abdd0cf1 ("common/cnxk: support 103XX CPT")
Signed-off-by: Daphne Priscilla <df at marvell.com>
Acked-by: Tejasree Kondoj <ktejasree at marvell.com>
---
.mailmap | 1 +
drivers/common/cnxk/roc_se.h | 2 +-
drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 3 +
drivers/crypto/cnxk/cnxk_se.h | 96 ++++++++++++++++++++++--
4 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/.mailmap b/.mailmap
index 2454099e0e..83165bd717 100644
--- a/.mailmap
+++ b/.mailmap
@@ -322,6 +322,7 @@ Danny Zhou <danny.zhou at intel.com>
Dan Wei <dan.wei at intel.com>
Danylo Vodopianov <dvo-plv at napatech.com>
Dapeng Yu <dapengx.yu at intel.com>
+Daphne Priscilla <df at marvell.com>
Darek Stojaczyk <dariusz.stojaczyk at intel.com>
Daria Kolistratova <daria.kolistratova at intel.com>
Dariusz Chaberski <dariuszx.chaberski at intel.com>
diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index ede8d69c0e..aa73614734 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -26,7 +26,7 @@
#define ROC_SE_MISC_MINOR_OP_DUMMY 0x04ULL
#define ROC_SE_MISC_MINOR_OP_HW_SUPPORT 0x08ULL
-#define ROC_SE_MAX_AAD_SIZE 64
+#define ROC_SE_MAX_AAD_SIZE 1024
#define ROC_SE_MAX_MAC_LEN 64
#define ROC_SE_OFF_CTRL_LEN 8
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
index 26cd9f0147..d979039c0e 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c
@@ -52,6 +52,9 @@ cnxk_cpt_get_mlen(void)
(RTE_ALIGN_CEIL(ROC_MAX_SG_IN_OUT_CNT, 4) >> 2) * ROC_SG_ENTRY_SIZE),
8);
+ /* Space for discarding AAD bytes from output stream in GCM OOP */
+ len += ROC_SE_MAX_AAD_SIZE;
+
return len;
}
diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h
index 649e38c495..8918c73d79 100644
--- a/drivers/crypto/cnxk/cnxk_se.h
+++ b/drivers/crypto/cnxk/cnxk_se.h
@@ -403,8 +403,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
if (unlikely(req_flags & ROC_SE_SINGLE_BUF_INPLACE)) {
i = fill_sg_comp_from_buf_min(scatter_comp, i, params->bufs, &size);
} else {
- i = fill_sg_comp_from_iov(scatter_comp, i, params->dst_iov, 0,
- &size, aad_buf, aad_offset);
+ uint32_t dst_offset = 0;
+
+ if (passthrough_len) {
+ if (unlikely(passthrough_len > ROC_SE_MAX_AAD_SIZE)) {
+ plt_dp_err(
+ "Passthrough length %u exceeds reserved space %u",
+ passthrough_len, ROC_SE_MAX_AAD_SIZE);
+ return -1;
+ }
+ uint64_t meta_passthrough =
+ (uint64_t)params->meta_buf.vaddr +
+ params->meta_buf.size - ROC_SE_MAX_AAD_SIZE;
+ i = fill_sg_comp(scatter_comp, i, meta_passthrough,
+ passthrough_len);
+ size -= passthrough_len;
+ dst_offset = passthrough_len;
+ aad_offset = 0;
+ }
+ if (size)
+ i = fill_sg_comp_from_iov(scatter_comp, i, params->dst_iov,
+ dst_offset, &size, aad_buf,
+ aad_offset);
}
if (unlikely(size)) {
plt_dp_err("Insufficient buffer space,"
@@ -426,8 +446,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
if (unlikely(req_flags & ROC_SE_SINGLE_BUF_INPLACE)) {
i = fill_sg_comp_from_buf_min(scatter_comp, i, params->bufs, &size);
} else {
- i = fill_sg_comp_from_iov(scatter_comp, i, params->dst_iov, 0,
- &size, aad_buf, aad_offset);
+ uint32_t dst_offset = 0;
+
+ if (passthrough_len) {
+ if (unlikely(passthrough_len > ROC_SE_MAX_AAD_SIZE)) {
+ plt_dp_err(
+ "Passthrough length %u exceeds reserved space %u",
+ passthrough_len, ROC_SE_MAX_AAD_SIZE);
+ return -1;
+ }
+ uint64_t meta_passthrough =
+ (uint64_t)params->meta_buf.vaddr +
+ params->meta_buf.size - ROC_SE_MAX_AAD_SIZE;
+ i = fill_sg_comp(scatter_comp, i, meta_passthrough,
+ passthrough_len);
+ size -= passthrough_len;
+ dst_offset = passthrough_len;
+ aad_offset = 0;
+ }
+ if (size)
+ i = fill_sg_comp_from_iov(scatter_comp, i, params->dst_iov,
+ dst_offset, &size, aad_buf,
+ aad_offset);
}
if (unlikely(size)) {
@@ -601,8 +641,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
i = fill_sg2_comp_from_buf_min(scatter_comp, i, params->bufs,
&size);
} else {
- i = fill_sg2_comp_from_iov(scatter_comp, i, params->dst_iov, 0,
- &size, aad_buf, aad_offset);
+ uint32_t dst_offset = 0;
+
+ if (passthrough_len) {
+ if (unlikely(passthrough_len > ROC_SE_MAX_AAD_SIZE)) {
+ plt_dp_err(
+ "Passthrough length %u exceeds reserved space %u",
+ passthrough_len, ROC_SE_MAX_AAD_SIZE);
+ return -1;
+ }
+ uint64_t meta_passthrough =
+ (uint64_t)params->meta_buf.vaddr +
+ params->meta_buf.size - ROC_SE_MAX_AAD_SIZE;
+ i = fill_sg2_comp(scatter_comp, i, meta_passthrough,
+ passthrough_len);
+ size -= passthrough_len;
+ dst_offset = passthrough_len;
+ aad_offset = 0;
+ }
+ if (size)
+ i = fill_sg2_comp_from_iov(scatter_comp, i, params->dst_iov,
+ dst_offset, &size, aad_buf,
+ aad_offset);
}
if (unlikely(size)) {
plt_dp_err("Insufficient buffer space,"
@@ -625,8 +685,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
i = fill_sg2_comp_from_buf_min(scatter_comp, i, params->bufs,
&size);
} else {
- i = fill_sg2_comp_from_iov(scatter_comp, i, params->dst_iov, 0,
- &size, aad_buf, aad_offset);
+ uint32_t dst_offset = 0;
+
+ if (passthrough_len) {
+ if (unlikely(passthrough_len > ROC_SE_MAX_AAD_SIZE)) {
+ plt_dp_err(
+ "Passthrough length %u exceeds reserved space %u",
+ passthrough_len, ROC_SE_MAX_AAD_SIZE);
+ return -1;
+ }
+ uint64_t meta_passthrough =
+ (uint64_t)params->meta_buf.vaddr +
+ params->meta_buf.size - ROC_SE_MAX_AAD_SIZE;
+ i = fill_sg2_comp(scatter_comp, i, meta_passthrough,
+ passthrough_len);
+ size -= passthrough_len;
+ dst_offset = passthrough_len;
+ aad_offset = 0;
+ }
+ if (size)
+ i = fill_sg2_comp_from_iov(scatter_comp, i, params->dst_iov,
+ dst_offset, &size, aad_buf,
+ aad_offset);
}
if (unlikely(size)) {
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-07-03 12:55:47.277619645 +0100
+++ 0015-crypto-cnxk-fix-out-of-place-AES-GCM.patch 2026-07-03 12:55:46.594571990 +0100
@@ -1 +1 @@
-From bd5d82a5a396ebca889973ff0665937c009964fa Mon Sep 17 00:00:00 2001
+From 32d04d621e3809f0a6764820e01a5c4c1c4b9eff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bd5d82a5a396ebca889973ff0665937c009964fa ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 8e1153ce58..594936b725 100644
+index 2454099e0e..83165bd717 100644
@@ -28,2 +29,2 @@
-@@ -336,6 +336,7 @@ Danny Patel <dannyp at marvell.com>
- Danny Zhou <danny.zhou at intel.com>
+@@ -322,6 +322,7 @@ Danny Zhou <danny.zhou at intel.com>
+ Dan Wei <dan.wei at intel.com>
@@ -37 +38 @@
-index 499e71ce85..d3ad61ca04 100644
+index ede8d69c0e..aa73614734 100644
@@ -50 +51 @@
-index ab4115d4dd..4c9bacecdd 100644
+index 26cd9f0147..d979039c0e 100644
@@ -53 +54 @@
-@@ -91,6 +91,9 @@ cnxk_cpt_get_mlen(void)
+@@ -52,6 +52,9 @@ cnxk_cpt_get_mlen(void)
@@ -64 +65 @@
-index 8dbf3e73c7..09d9d1e0e3 100644
+index 649e38c495..8918c73d79 100644
@@ -67 +68 @@
-@@ -407,8 +407,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
+@@ -403,8 +403,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
@@ -98 +99 @@
-@@ -430,8 +450,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
+@@ -426,8 +446,28 @@ sg_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
@@ -129 +130 @@
-@@ -606,8 +646,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
+@@ -601,8 +641,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
@@ -160 +161 @@
-@@ -632,8 +692,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
+@@ -625,8 +685,28 @@ sg2_inst_prep(struct roc_se_fc_params *params, struct cpt_inst_s *inst, uint64_t
More information about the stable
mailing list