patch 'app/crypto-perf: fix AAD offset alignment' has been queued to stable release 22.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/14/25. 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/f6a0e5020282eb283fab3dfe5b6a8d642d2c7807

Thanks.

Luca Boccassi

---
>From f6a0e5020282eb283fab3dfe5b6a8d642d2c7807 Mon Sep 17 00:00:00 2001
From: Shani Peretz <shperetz at nvidia.com>
Date: Tue, 11 Mar 2025 11:01:21 +0200
Subject: [PATCH] app/crypto-perf: fix AAD offset alignment

[ upstream commit 7c52aea4e68e0cacc7e41ff08fcddbd513ad7e0a ]

AAD offset in AES-GCM crypto test was calculated by adding
16-byte alignment after the IV, which is only needed in AES-CCM.

The patch correct the AAD offset calculation in AES-GCM algorithm tests.

Fixes: 0b242422d385 ("app/crypto-perf: set AAD after the crypto operation")

Signed-off-by: Shani Peretz <shperetz at nvidia.com>
---
 app/test-crypto-perf/cperf_ops.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 6bbab3289e..c655101ac7 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -535,7 +535,9 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
 	uint16_t i;
 	/* AAD is placed after the IV */
 	uint16_t aad_offset = iv_offset +
-			RTE_ALIGN_CEIL(test_vector->aead_iv.length, 16);
+			((options->aead_algo == RTE_CRYPTO_AEAD_AES_CCM) ?
+			RTE_ALIGN_CEIL(test_vector->aead_iv.length, 16) :
+			test_vector->aead_iv.length);
 
 	for (i = 0; i < nb_ops; i++) {
 		struct rte_crypto_sym_op *sym_op = ops[i]->sym;
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-12 22:06:24.490831274 +0100
+++ 0016-app-crypto-perf-fix-AAD-offset-alignment.patch	2025-06-12 22:06:23.806043286 +0100
@@ -1 +1 @@
-From 7c52aea4e68e0cacc7e41ff08fcddbd513ad7e0a Mon Sep 17 00:00:00 2001
+From f6a0e5020282eb283fab3dfe5b6a8d642d2c7807 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c52aea4e68e0cacc7e41ff08fcddbd513ad7e0a ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 37d06f1dea..47965bbc32 100644
+index 6bbab3289e..c655101ac7 100644
@@ -23 +24 @@
-@@ -722,7 +722,9 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,
+@@ -535,7 +535,9 @@ cperf_set_ops_aead(struct rte_crypto_op **ops,