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 36D3F428F8 for ; Sun, 9 Apr 2023 17:37:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BDCF41149; Sun, 9 Apr 2023 17:37:32 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73]) by mails.dpdk.org (Postfix) with ESMTP id F0E3740141 for ; Sun, 9 Apr 2023 17:37:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N/L8Eb3TTeICxu9J0eSC3iARxYuo5v3NYeicH7RUhEQu+Jxo2jyg5CHzcAa7lYdCydGOMVSnZGBlZvAUi6S1E9CBF0OVqCsaUPVNXKJ/MxnVaQI3UscWMIhhDBAPdkOttS0n5YRF8/iC9xj+zcPXYabviqFYr75FU1FClMZvOlGMqOQg+Ab+PqSJULr5yuN2A9cguRmGp+DSkLyAO1AqVLMy0p1SMja6eAbivw/3bKNdaC6sJNL8xrzM4v3ByBlPQA58SzExRfws6Ia0WaBOwsJgbcHMCczwIkPi/ewy0GuY1G4keqSe1Tkdq2y9uL0XgSZBpNdLp0cn3DrSbhp1dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t5Ohk4Zxyk6ZZM3EHMIC953HP3ngnKl8wtrqeQs3eWc=; b=cgiJI91biVBWUURnUD2cSPQSDicTwuOe1XaHOsXt+qOb+df+UZCEsW19Sv6/TFMzwL1NZ+3hPmVkyDXF8aVZoskMSmaML+urs2a+meW2sz7D9qB+N6FlVqzCyjIyU2FU8SOdGWqW9aLUXeMliefoxresTf0ry1p5T6G6rBs4r8RTXqqrHWypyc6aewLKk9Me60qXzcGgDLXbHNjTwcx+Oy8E+K1J5gCyZMe0CxO+3c4TQcVRTNKfhhL75nNotRshWgIXv3P3+6jXvt6K8k5ogvpseOfTK4DpUY8FPW/723Ls1VS4cNTO5R2lzJr/CM4csErGgJzFtI3yG6T2SKi2xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t5Ohk4Zxyk6ZZM3EHMIC953HP3ngnKl8wtrqeQs3eWc=; b=j32GxBQUb03tu8N412OB0+QG4Pwxhx3jNSkWz0M7dkNwH+lZ3242XNfDJtfQYxZgPq3SbW38JZhP08Ozf+pAy9QL0IAC5z4Cw7EctRZ3cBsuqiIqpEJXxIG/lK5/IVtO7N8CeFewDB94KlpitA6S+e50Fa2AZDDFaRT4OWML8E4oUilV9p4ggN44yvW9x0XqGW6bHgTOlB1mJKobKgGQ/COmRB5PAe2aqh4Hg5n3BwFRl40MUNssXjNo61YjIzMHkBTA/7TXKTRumgBh0Nm1gKYHrXJGNsSCN1TQZ0Qa7KxzwNfiF4WDpEg6kXzzzsq70+k8JiceToEqKjJxhQ275w== Received: from BN0PR04CA0026.namprd04.prod.outlook.com (2603:10b6:408:ee::31) by SA1PR12MB7199.namprd12.prod.outlook.com (2603:10b6:806:2bc::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35; Sun, 9 Apr 2023 15:37:29 +0000 Received: from BN8NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ee:cafe::6) by BN0PR04CA0026.outlook.office365.com (2603:10b6:408:ee::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35 via Frontend Transport; Sun, 9 Apr 2023 15:37:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT018.mail.protection.outlook.com (10.13.176.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:37:28 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:37:20 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:37:18 -0700 From: Xueming Li To: Saoirse O'Donovan CC: Ciara Power , dpdk stable Subject: patch 'test/crypto: fix statistics error messages' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:23 +0800 Message-ID: <20230409152529.5308-136-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT018:EE_|SA1PR12MB7199:EE_ X-MS-Office365-Filtering-Correlation-Id: c0105ce8-f9b2-4d70-06b7-08db39105357 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4NQS24U5h5W16nZ9z8vPbwHNfRWva/GcTPpjXjgksQbg7pG6w2OIx29KITdEY9ypCeUmUfb2YXwGZqWxV9fI2N6NWAYlFvWk269R5OB9Ygb+0OyUSYNcXXz6x4iMqY8/BwbValxQTU30N1IgQ+gSyRwKZR8PGTH4nPiRbrPyL4mvpMRJDhXuh49JGMv5PSp2yX3L5KEf8Wz1HYlv3idpzt8eRrnLznt79X32b/Vq11VZKdXJ5vYujBpvkhf0ltM8MraKnJzIIDVSeDW1kFxU6fKiCezCOIfo12kvvuXPSLjxoJPsUo8kO3LHkLYuh5CyEkn4aZaPjjOT9SU4AYyIbF4WvQtoX2O4RbGonKs48jZqcnOeYP5kgi0Ne/z+2gnJs2ypS32oXTVRy6C7ITGof7Ewo0UAPxp0GMzskueCkdGrE37exTKWDULYQxyd4ENz70Dw5CDhLONqDkVz6i2w7+aMdizw03Eed50XZ2DqkCBeSCzPLXrrPxVcA23eeZlXlsK/PgKN56ewtfrnvgocAF22MqkhUB8zjdeLyDMXZS7S/uoke+XkVMXx2Gj0OZOGqpA1i13zVuV9iiS01HWcpzuIBc1yPPT/+3uSJ0L3roXL1bHBZ+lMDi5Xe5FUhEbEUKbn5kvbWdkp+is5di4tv/5BR2KeJzrKKdMn41xSs6N7xHVy1aiSgr6OZ8M4YRIAm5hVk6BeISvvlZJJ5vqGEHQZQZjR13a7SpfykurEJYaBmxtvA2mpaJhfMVVqxN18IAnl3cN1Lo3jODUkqQxsmz8bWi6NXNYISSLPkN6d8ZYm228naIk/vcnVokc+3lCYZGtYUSJiccZGSG6uhwEXQA== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(396003)(346002)(376002)(451199021)(36840700001)(46966006)(40470700004)(36860700001)(54906003)(2616005)(47076005)(478600001)(966005)(26005)(1076003)(6666004)(7696005)(82740400003)(7636003)(41300700001)(356005)(316002)(4326008)(6916009)(53546011)(186003)(6286002)(16526019)(336012)(83380400001)(426003)(70586007)(70206006)(2906002)(5660300002)(36756003)(15650500001)(82310400005)(40460700003)(86362001)(40480700001)(55016003)(8936002)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:37:28.1498 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0105ce8-f9b2-4d70-06b7-08db39105357 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7199 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 Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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/log/?h=22.11-staging/commit/fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1 Thanks. Xueming Li --- >From fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1 Mon Sep 17 00:00:00 2001 From: Saoirse O'Donovan Date: Mon, 20 Mar 2023 09:29:56 +0000 Subject: [PATCH] test/crypto: fix statistics error messages Cc: Xueming Li [ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] The test stats testcase was printing the same error message for multiple errors in the test stats testcase. This is now replaced with descriptive error messages, which match the cause of the failure. Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests") Signed-off-by: Saoirse O'Donovan Acked-by: Ciara Power --- .mailmap | 1 + app/test/test_cryptodev.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 039d487d6d..c09043056c 100644 --- a/.mailmap +++ b/.mailmap @@ -1168,6 +1168,7 @@ Sangjin Han Sankar Chokkalingam Santoshkumar Karanappa Rastapur Santosh Shukla +Saoirse O'Donovan Saori Usami Sarath Somasekharan Sarosh Arif diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 7be4bf40b8..0df4e9fca1 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -11992,11 +11992,11 @@ test_stats(void) TEST_ASSERT((stats.enqueued_count == 1), "rte_cryptodev_stats_get returned unexpected enqueued stat"); TEST_ASSERT((stats.dequeued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat"); TEST_ASSERT((stats.enqueue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued error count stat"); TEST_ASSERT((stats.dequeue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued error count stat"); /* invalid device but should ignore and not reset device stats*/ rte_cryptodev_stats_reset(ts_params->valid_devs[0] + 300); @@ -12004,7 +12004,7 @@ test_stats(void) &stats), "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset"); /* check that a valid reset clears stats */ rte_cryptodev_stats_reset(ts_params->valid_devs[0]); @@ -12012,9 +12012,9 @@ test_stats(void) &stats), "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset"); TEST_ASSERT((stats.dequeued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset"); return TEST_SUCCESS; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.224267800 +0800 +++ 0135-test-crypto-fix-statistics-error-messages.patch 2023-04-09 21:45:38.819042200 +0800 @@ -1 +1 @@ -From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001 +From fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index dc30369117..cac02a6f48 100644 +index 039d487d6d..c09043056c 100644 @@ -24 +26 @@ -@@ -1182,6 +1182,7 @@ Sangjin Han +@@ -1168,6 +1168,7 @@ Sangjin Han @@ -33 +35 @@ -index f4648755e5..9c670e9a35 100644 +index 7be4bf40b8..0df4e9fca1 100644 @@ -36 +38 @@ -@@ -12341,11 +12341,11 @@ test_stats(void) +@@ -11992,11 +11992,11 @@ test_stats(void) @@ -51 +53 @@ -@@ -12353,7 +12353,7 @@ test_stats(void) +@@ -12004,7 +12004,7 @@ test_stats(void) @@ -60 +62 @@ -@@ -12361,9 +12361,9 @@ test_stats(void) +@@ -12012,9 +12012,9 @@ test_stats(void)