patch 'test/crypto: fix return value for GMAC case' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:21:15 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=486fb2f97c5e78cabcc585f154841b0997458302
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 486fb2f97c5e78cabcc585f154841b0997458302 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Mon, 28 Aug 2023 12:21:07 +0530
Subject: [PATCH] test/crypto: fix return value for GMAC case
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 6660c7581990c2f1564a1b23a31d301f2135eb72 ]
create_gmac_session is already converting the return value
of ENOTSUP to TEST_SKIPPED.
Fixes: bdce2564dbf7 ("cryptodev: rework session framework")
Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
app/test/test_cryptodev.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 8a9251c818..b75edb2f2b 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -13009,7 +13009,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
retval = create_gmac_session(ts_params->valid_devs[0],
tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
- if (retval == -ENOTSUP)
+ if (retval == TEST_SKIPPED)
return TEST_SKIPPED;
if (retval < 0)
return retval;
@@ -13140,7 +13140,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
retval = create_gmac_session(ts_params->valid_devs[0],
tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
- if (retval == -ENOTSUP)
+ if (retval == TEST_SKIPPED)
return TEST_SKIPPED;
if (retval < 0)
return retval;
@@ -13269,7 +13269,7 @@ test_AES_GMAC_authentication_SGL(const struct gmac_test_data *tdata,
retval = create_gmac_session(ts_params->valid_devs[0],
tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
- if (retval == -ENOTSUP)
+ if (retval == TEST_SKIPPED)
return TEST_SKIPPED;
if (retval < 0)
return retval;
@@ -13886,7 +13886,7 @@ test_authentication_verify_fail_when_data_corruption(
reference,
RTE_CRYPTO_AUTH_OP_VERIFY);
- if (retval == -ENOTSUP)
+ if (retval == TEST_SKIPPED)
return TEST_SKIPPED;
if (retval < 0)
return retval;
@@ -13973,6 +13973,8 @@ test_authentication_verify_GMAC_fail_when_corruption(
reference,
RTE_CRYPTO_AUTH_OP_VERIFY,
RTE_CRYPTO_CIPHER_OP_DECRYPT);
+ if (retval == TEST_SKIPPED)
+ return TEST_SKIPPED;
if (retval < 0)
return retval;
@@ -14063,8 +14065,7 @@ test_authenticated_decryption_fail_when_corruption(
reference,
RTE_CRYPTO_AUTH_OP_VERIFY,
RTE_CRYPTO_CIPHER_OP_DECRYPT);
-
- if (retval == -ENOTSUP)
+ if (retval == TEST_SKIPPED)
return TEST_SKIPPED;
if (retval < 0)
return retval;
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:36.134205400 +0800
+++ 0046-test-crypto-fix-return-value-for-GMAC-case.patch 2023-10-22 22:17:34.256723700 +0800
@@ -1 +1 @@
-From 6660c7581990c2f1564a1b23a31d301f2135eb72 Mon Sep 17 00:00:00 2001
+From 486fb2f97c5e78cabcc585f154841b0997458302 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 6660c7581990c2f1564a1b23a31d301f2135eb72 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index aff1c8e55b..049ee17d41 100644
+index 8a9251c818..b75edb2f2b 100644
@@ -22 +24 @@
-@@ -13544,7 +13544,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
+@@ -13009,7 +13009,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
@@ -31 +33 @@
-@@ -13677,7 +13677,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
+@@ -13140,7 +13140,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
@@ -40 +42 @@
-@@ -13808,7 +13808,7 @@ test_AES_GMAC_authentication_SGL(const struct gmac_test_data *tdata,
+@@ -13269,7 +13269,7 @@ test_AES_GMAC_authentication_SGL(const struct gmac_test_data *tdata,
@@ -49 +51 @@
-@@ -14425,7 +14425,7 @@ test_authentication_verify_fail_when_data_corruption(
+@@ -13886,7 +13886,7 @@ test_authentication_verify_fail_when_data_corruption(
@@ -58 +60 @@
-@@ -14514,6 +14514,8 @@ test_authentication_verify_GMAC_fail_when_corruption(
+@@ -13973,6 +13973,8 @@ test_authentication_verify_GMAC_fail_when_corruption(
@@ -67 +69 @@
-@@ -14606,8 +14608,7 @@ test_authenticated_decryption_fail_when_corruption(
+@@ -14063,8 +14065,7 @@ test_authenticated_decryption_fail_when_corruption(
More information about the stable
mailing list