[dpdk-stable] patch 'test/crypto: fix autotest function parameters' has been queued to stable release 20.11.3

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Jul 12 15:05:11 CEST 2021


Hi,

FYI, your patch has been queued to stable release 20.11.3

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/14/21. 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/7eaf51dbe70e676852cd4e36164c2b8060d14d19

Thanks.

Luca Boccassi

---
>From 7eaf51dbe70e676852cd4e36164c2b8060d14d19 Mon Sep 17 00:00:00 2001
From: Rebecca Troy <rebecca.troy at intel.com>
Date: Wed, 30 Jun 2021 14:01:41 +0000
Subject: [PATCH] test/crypto: fix autotest function parameters

[ upstream commit 4ea794318a523ef8365e2a765ba47171d223d4ee ]

Fixed parameters on autotest functions by removing comments.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")
Fixes: 4ed1e79e7819 ("test/crypto: add tests for virtio-crypto")
Fixes: 3aafc423cf4d ("snow3g: add driver for SNOW 3G library")
Fixes: 27a1c4714d54 ("app/test: add KASUMI crypto")
Fixes: 4c99481f49c4 ("app/test: add ZUC")
Fixes: c8e69fce7046 ("crypto/scheduler: add unit test")
Fixes: ae002048bbea ("test/crypto: add DPAA2 crypto functional test")
Fixes: b674d6d0381a ("test/crypto: add dpaa crypto test cases")
Fixes: a8dbd44d6b4c ("test/crypto: add CAAM JR validation cases")
Fixes: 4868f6591c6f ("test/crypto: add cases for raw datapath API")

Signed-off-by: Rebecca Troy <rebecca.troy at intel.com>
Acked-by: Ciara Power <ciara.power at intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 app/test/test_cryptodev.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 8c76cdb313..ea62e07daa 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -13787,7 +13787,7 @@ static struct unit_test_suite cryptodev_ccp_testsuite  = {
 };
 
 static int
-test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_qat(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
@@ -13801,7 +13801,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
 }
 
 static int
-test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_virtio(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
@@ -13815,7 +13815,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
 }
 
 static int
-test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_aesni_mb(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
@@ -13913,7 +13913,7 @@ test_cryptodev_null(void)
 }
 
 static int
-test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_sw_snow3g(void)
 {
 	gbl_driver_id = rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
@@ -13927,7 +13927,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
 }
 
 static int
-test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_sw_kasumi(void)
 {
 	gbl_driver_id = rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
@@ -13941,7 +13941,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
 }
 
 static int
-test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_sw_zuc(void)
 {
 	gbl_driver_id = rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
@@ -13985,7 +13985,7 @@ test_cryptodev_mrvl(void)
 #ifdef RTE_CRYPTO_SCHEDULER
 
 static int
-test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_scheduler(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
@@ -14008,7 +14008,7 @@ REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
 #endif
 
 static int
-test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_dpaa2_sec(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
@@ -14022,7 +14022,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
 }
 
 static int
-test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_dpaa_sec(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
@@ -14074,7 +14074,7 @@ test_cryptodev_octeontx2(void)
 }
 
 static int
-test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_caam_jr(void)
 {
 	gbl_driver_id =	rte_cryptodev_driver_id_get(
 			RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
@@ -14116,7 +14116,7 @@ test_cryptodev_bcmfs(void)
 }
 
 static int
-test_cryptodev_qat_raw_api(void /*argv __rte_unused, int argc __rte_unused*/)
+test_cryptodev_qat_raw_api(void)
 {
 	int ret;
 
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:40.600632666 +0100
+++ 0076-test-crypto-fix-autotest-function-parameters.patch	2021-07-12 13:41:36.670126360 +0100
@@ -1 +1 @@
-From 4ea794318a523ef8365e2a765ba47171d223d4ee Mon Sep 17 00:00:00 2001
+From 7eaf51dbe70e676852cd4e36164c2b8060d14d19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4ea794318a523ef8365e2a765ba47171d223d4ee ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -29 +30 @@
-index dd1669e007..538c7b503b 100644
+index 8c76cdb313..ea62e07daa 100644
@@ -32,2 +33,2 @@
-@@ -14522,19 +14522,19 @@ run_cryptodev_testsuite(const char *pmd_name)
- }
+@@ -13787,7 +13787,7 @@ static struct unit_test_suite cryptodev_ccp_testsuite  = {
+ };
@@ -39 +40,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
+@@ -13801,7 +13801,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -46 +49,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+@@ -13815,7 +13815,7 @@ test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -53,3 +58,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
- }
-@@ -14580,19 +14580,19 @@ test_cryptodev_null(void)
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+@@ -13913,7 +13913,7 @@ test_cryptodev_null(void)
@@ -62 +67,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
+ 	gbl_driver_id = rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
+@@ -13927,7 +13927,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -69 +76,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
+ 	gbl_driver_id = rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
+@@ -13941,7 +13941,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -76,3 +85,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
- }
-@@ -14612,7 +14612,7 @@ test_cryptodev_mrvl(void)
+ 	gbl_driver_id = rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_ZUC_PMD));
+@@ -13985,7 +13985,7 @@ test_cryptodev_mrvl(void)
@@ -85,3 +94,3 @@
- 	uint8_t ret, sched_i, j, i = 0, blk_start_idx = 0;
- 	const enum blockcipher_test_type blk_suites[] = {
-@@ -14720,13 +14720,13 @@ REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD));
+@@ -14008,7 +14008,7 @@ REGISTER_TEST_COMMAND(cryptodev_scheduler_autotest, test_cryptodev_scheduler);
@@ -94 +103,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD));
+@@ -14022,7 +14022,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -101,3 +112,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
- }
-@@ -14750,7 +14750,7 @@ test_cryptodev_octeontx2(void)
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
+@@ -14074,7 +14074,7 @@ test_cryptodev_octeontx2(void)
@@ -110,3 +121,3 @@
- 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
- }
-@@ -14768,7 +14768,7 @@ test_cryptodev_bcmfs(void)
+ 	gbl_driver_id =	rte_cryptodev_driver_id_get(
+ 			RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
+@@ -14116,7 +14116,7 @@ test_cryptodev_bcmfs(void)


More information about the stable mailing list