From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BF4EFA0C4C for ; Mon, 12 Jul 2021 15:14:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B60C340685; Mon, 12 Jul 2021 15:14:10 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 1441140685 for ; Mon, 12 Jul 2021 15:14:09 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id k4so19248251wrc.8 for ; Mon, 12 Jul 2021 06:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GNIq07ItMEeNzHnq3oQjdW4ALlL6vJErBZ6Mul/NVaA=; b=q7+IIQQNVkyH3RtOBQ3fzFQ0mH+vToG4IMgoxeWHBn2VVJ8/LM0jllX88bOH4XPoB2 IESDMlPOeq4duxjTYKBJcwxN4evA4Zm4l2SuJvuHXB1Sg25HnBFpcuYsKPIO/ChjXrKh eotBOWuI55aCClCveP+jROdCujQ812gxHe3Kmy7NhObb8hDhwmna0abG5qczQARW6Ira XXfJCrgvem0Bvaq7OgMtYLZEjqntn8M/kJKd3kggiKNyV6VESceYjpWwPwDZyrpM6ChJ vA68+t6ftfoqE0A+5ILee6IS3VohLJNyuasO1r/D/TzbDMfaqcsMjMa5TqSAzadQNsC5 Bwfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GNIq07ItMEeNzHnq3oQjdW4ALlL6vJErBZ6Mul/NVaA=; b=kgWByGcP0qj1186DAUPmL9SahJ1t3/HlfwX2B3ulSyIkMTLIaxsbeOnYiBS7r5L6H0 Vq0URp19dumAsU5XcD9SMETPjdNicG+ZMQYEwKzcauWnPRfOiB/jvvVpB9X+EAISnoMF G2L0bjKtlSJfh+n3tFD63F3r74EqAhgpjUBqv8HB+qO+g4PEoIZfXqk4CDLaHTcN1Vbd g+AiSBLc13BhSA1Ti71SlKmflcERvFCH9gllcE0e8HKMPU6wCXvPO8snAVgdpKG1b2yK GMoWW+U59lyqb2TQBPE7wnOXvwf7NkSQuMor/QTPo/K62gMAVTx2gn81lZTyKihVFo5F ZTaQ== X-Gm-Message-State: AOAM531rVed6qeBuE8/oqfvWcFuQndVyLlP2urJ42BfGWyGNr3r8NIKt yoTXd1PtbQq8aPU2p3N9g/o= X-Google-Smtp-Source: ABdhPJwI3KaEr4C1US7QY3lt9C4OOKzQUFp+yr2JyUF2Kp+eVvNRuGhI9sjgS+4BOpHlAEP8fD2hWw== X-Received: by 2002:adf:dc82:: with SMTP id r2mr34565503wrj.33.1626095648876; Mon, 12 Jul 2021 06:14:08 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id y13sm14263396wrp.80.2021.07.12.06.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:14:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Rebecca Troy Cc: Ciara Power , Hemant Agrawal , Akhil Goyal , dpdk stable Date: Mon, 12 Jul 2021 14:05:11 +0100 Message-Id: <20210712130551.2462159-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/crypto: fix autotest function parameters' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Ciara Power Acked-by: Hemant Agrawal Acked-by: Akhil Goyal --- 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@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)