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 C43E8A0548 for ; Sun, 28 Nov 2021 15:58:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEA024068A; Sun, 28 Nov 2021 15:58:29 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) by mails.dpdk.org (Postfix) with ESMTP id BF15F40E5A for ; Sun, 28 Nov 2021 15:58:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4cUp8tDj+GBKYsION8dkhoR9watIVHGwRP1encz+bw32qtmZnGOXMjCzgQGJIOViFM2xlXOkA9c2R5kNlsYhzgda3/vqwkyahwv0SPpxw6ypWab5LbK65aR/EDMdT64MzWC4a+4N0RDkeraifoqIcXGPv02Fph1Lu2XS+Nx9THdIXXS0xdXopsBrFutpqij7rnmbCM3XkNSUvhiZj48h+V0hzHojrtysQyzgr95HSI5aqRkXQTKNxwSZcW1uA/Vb0McEzEk3TV5AlHIUMYtfklAlvi2NtbYWO2jLA9r46AypV73/YpCPz9++jeglebBDzXewxeUdpmK4lLPiNxc4w== 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=Z0lK/Tmex1nfnGHTnvCDmiW6ucx9AEoRNTw+P/YxKs8=; b=K5GfTWToDGBdQ9AA5f0n/YrztsyG6YRqJdPBAxes+w4bI2UNefVoZ+8YNfw6tlwOOIeORNsGsGgy8V1qYGE9fG0giB5TeuSDWjlgtycWV9yLqRZddX8CdCXFppv0/seCiz/k7LbaIlxDXSUfRz+Ed1BdpyAuqFm88ihBNoHmKcp6Q7Pk0m4MCJoDFYD8Hxq63WJzpFYW3W2+9huUIBh6n7q710ol3lpl2GDiwvjKwQAr8p8557ihC7tBacEDzOfujwk8vIh0+VWVyF3c6gwQS2jCSwXyI42fxX2RY6SHLNUa3xrP+C8QghRJIggWlOgDUkhCEo9DvPIwvFIgIz1OBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=Z0lK/Tmex1nfnGHTnvCDmiW6ucx9AEoRNTw+P/YxKs8=; b=m2A4u2EBYNPqoEFCqo5qhTah+YDtV2X70Ev1NOUks1b2Rc1YhPgAIjphxyAASsFtCrzgHJBNcGe4m55fg8ibrnfzuPEODtlb+z+KTMu7HGA4mjfIAp9YDQjkF0OD3JAiMxWpzKHGUYR/AQ8oUkoGbKAn0kIwPKhriUWLpMorby8GC/6u0jYmWEarNGWpDcd/y21m2008r6kFb1rNJ7I29E+Grq1HTdV+jwW/vCm2BxUwI6s0P+jhOfzHMnCr1tpBc86dG/lxQ69ZAqm6JiwsVU5z75pvIFdYyTOdFieqdL/nuGGpqF9JHx/hrOeGMm6DRzg3Ry7UX/0LRk1E9Ff9sQ== Received: from DM5PR20CA0027.namprd20.prod.outlook.com (2603:10b6:3:13d::13) by MWHPR1201MB2527.namprd12.prod.outlook.com (2603:10b6:300:df::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 14:58:26 +0000 Received: from DM6NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13d:cafe::f5) by DM5PR20CA0027.outlook.office365.com (2603:10b6:3:13d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:58:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT061.mail.protection.outlook.com (10.13.173.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:58:26 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 14:58:23 +0000 From: Xueming Li To: Anoob Joseph CC: Luca Boccassi , Ciara Power , Pablo de Lara , dpdk stable Subject: patch 'test/crypto: skip plain text compare for null cipher' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:35 +0800 Message-ID: <20211128145423.3974892-32-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b70d43d0-02dd-4702-4259-08d9b27f87ff X-MS-TrafficTypeDiagnostic: MWHPR1201MB2527: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 00rZUMAkDgy3T8W2a43IF25YDwpNtyjxRH73mxOmAT9406rdBvnXtk5nBbdj3KwY+ynyKEI/ysRVwzfTetEsTYInGZI8WO4a2B5AetBoJM6H7zRj4/5A17xuvr49jihCDDZp+c3ivgxnq5ptERYf2Pf2mm6yASAJwnZXj/fJcq4P1FlgsRBj/5Oqma079laFpG8FJQXI6QRWHjHDlCc6arKZjwWGiRKdk4A4N026opd9p/aDdlXj3LFY+Umft5LnA5x+S/3Z+szLifeKJRNIL8Wkt6WwZvZteoqgQarCkchQNnGBvx7EXghp9vNKEnN+G7N0DdF6dFd1R/Wc+Kv1kL8KOSEEbgZmWyM3V9wZAS/HgykZLERf6PDew+41VYhHAhhbsO74G15gOIYnRx1OqH/xQFtXplFkmHxW74d3ulo7njn18t98KTZT8hRVjE0xwkivzsHxcWqTTJLtj9CNxKdPm4Kb8f+5WAApYS08JfA5JwbgNCOnzwp44Ne38H2L0SRfJI4NHhXvt1iQHYmjrJCwMdPd0CznDsjWGr8xmo0/Ji5IqAP37KTfcL7Ycx/Fd5hDD7LekLBSBsW/Su10qBSO0bE7DWwpt19ggWtWmgUmYgkvdUGklYVBx6mxoA1voQOGIcI0C2Mnh4xi2c+mL3ziYj55S+1Hz4NaT02lT/On04Q3H86Vws1QeAM8npIyrm9dX/Sy+ver2tk4bN1/P1bVeSEyTk+bNZRALdisgOKq9/UWXixk0xEg5iBUlMALmmcv7VRbgt/s40rJU/iKTiHqgary9Pu4bsvuFlAI+YKufOX6tNvyNn9gqd2AwxECAfqzL4WzcWwMf0a07f3pxw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(70206006)(36860700001)(5660300002)(86362001)(4001150100001)(4326008)(6666004)(2906002)(26005)(70586007)(6916009)(966005)(186003)(2616005)(508600001)(54906003)(8936002)(36756003)(7696005)(1076003)(6286002)(47076005)(356005)(7636003)(82310400004)(426003)(55016003)(53546011)(16526019)(8676002)(83380400001)(316002)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:58:26.0809 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b70d43d0-02dd-4702-4259-08d9b27f87ff X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB2527 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 20.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/30/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/139df4588581128bc94f26439c56aa5ddb681d96 Thanks. Xueming Li --- >From 139df4588581128bc94f26439c56aa5ddb681d96 Mon Sep 17 00:00:00 2001 From: Anoob Joseph Date: Wed, 10 Nov 2021 18:34:08 +0530 Subject: [PATCH] test/crypto: skip plain text compare for null cipher Cc: Xueming Li [ upstream commit 9fc69835feb33d0e155076163ecc2f5479cf1bc2 ] NULL cipher is used for validating auth only cases. With NULL cipher, validating plain text should not be done as the PMD is only expected to update auth data. Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR-CMAC") Signed-off-by: Anoob Joseph Acked-by: Ciara Power Acked-by: Pablo de Lara --- app/test/test_cryptodev.c | 63 ++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 4772eea30c..7270730145 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -6951,27 +6951,30 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.len); } - /* Validate obuf */ - if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - plaintext, - tdata->plaintext.data, - tdata->plaintext.len_bits >> 3, - "Plaintext data not as expected"); - } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - ciphertext, - tdata->ciphertext.data, - tdata->validDataLen.len_bits, - "Ciphertext data not as expected"); - + if (!verify) { TEST_ASSERT_BUFFERS_ARE_EQUAL( ut_params->digest, tdata->digest_enc.data, - DIGEST_BYTE_LENGTH_SNOW3G_UIA2, + tdata->digest_enc.len, "Generated auth tag not as expected"); } + if (tdata->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { + if (verify) { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + plaintext, + tdata->plaintext.data, + tdata->plaintext.len_bits >> 3, + "Plaintext data not as expected"); + } else { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + ciphertext, + tdata->ciphertext.data, + tdata->validDataLen.len_bits, + "Ciphertext data not as expected"); + } + } + TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS, "crypto op processing failed"); @@ -7168,19 +7171,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, tdata->digest_enc.data, tdata->digest_enc.len); } - /* Validate obuf */ - if (verify) { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - plaintext, - tdata->plaintext.data, - tdata->plaintext.len_bits >> 3, - "Plaintext data not as expected"); - } else { - TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( - ciphertext, - tdata->ciphertext.data, - tdata->validDataLen.len_bits, - "Ciphertext data not as expected"); + if (!verify) { TEST_ASSERT_BUFFERS_ARE_EQUAL( digest, tdata->digest_enc.data, @@ -7188,6 +7179,22 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, "Generated auth tag not as expected"); } + if (tdata->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { + if (verify) { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + plaintext, + tdata->plaintext.data, + tdata->plaintext.len_bits >> 3, + "Plaintext data not as expected"); + } else { + TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT( + ciphertext, + tdata->ciphertext.data, + tdata->validDataLen.len_bits, + "Ciphertext data not as expected"); + } + } + TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS, "crypto op processing failed"); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:04.990522663 +0800 +++ 0031-test-crypto-skip-plain-text-compare-for-null-cipher.patch 2021-11-28 22:41:03.253542187 +0800 @@ -1 +1 @@ -From 9fc69835feb33d0e155076163ecc2f5479cf1bc2 Mon Sep 17 00:00:00 2001 +From 139df4588581128bc94f26439c56aa5ddb681d96 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9fc69835feb33d0e155076163ecc2f5479cf1bc2 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 52457596e2..1b68d7c43b 100644 +index 4772eea30c..7270730145 100644 @@ -24 +26 @@ -@@ -7484,27 +7484,30 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, +@@ -6951,27 +6951,30 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata, @@ -70 +72 @@ -@@ -7701,19 +7704,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, +@@ -7168,19 +7171,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, @@ -91 +93 @@ -@@ -7721,6 +7712,22 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, +@@ -7188,6 +7179,22 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,