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 02617428F8 for ; Sun, 9 Apr 2023 17:34:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F135542D0C; Sun, 9 Apr 2023 17:34:54 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2058.outbound.protection.outlook.com [40.107.223.58]) by mails.dpdk.org (Postfix) with ESMTP id 98B804067E for ; Sun, 9 Apr 2023 17:34:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d+kXy6n5IFY4aQ4xg3c+t/QhctSumIip2PDGocuhBMr4H1mzI3HxCM8YjzoB3hEEGYtHr2n+z1+pidEcVkGWgFI5INVywkcBUGlTJLa+tOCjz5c340QOcuyosDAI6C2chsCJmSaI5WhbT3Gw7rZuMXRkV69euow8G/yS6swyN23862WSU0Acc10auWJdbsPwjFBJOxJPyI0Mvr5IiaSZOK066BK1pDvX9rxR6RHunQgQegzE4I139SiBudVDsTGsYUtciGwx8zaICE2AhSerPiEGMNAJQCzl9X152iUK80RPB6NTOQ+MsttwaV6XgVTMK4P9qrr1Hm5myXL3rb/BBg== 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=foDdtnTpYX7KOKaEK3AaAbPoFVhLCYDu2WsS1Ux5kGs=; b=MAOBieS+YYAHSK3BsrL826uSgWMa0THEh81OLa20Inel+0A/MDCAJbJZUlc1WHqNWHuR6aBNQLrC0vYIpMMLcMnZAg+F6hPuR0tf/pcr4a0FHDQPuKLyqXVdpT3dBWH1N4PbV818FcJ1MfAD+zdbpaneC46jrb+MGGYolv7IN0pFgNyser+GzjwLs02SW2a1g665EGzxginm0j+XRBImY1EwPu9tj4bbE2YHvBNdKC0CDiRux/aDojFYpLPA0Ug9Rfb8S5hU6CjZTsrH8OSQXfaSGgaL1hl5o1TUwg5CHXGGxew+b97OJ2jP3HHgGRiLLGCW0SBIeLI+B2U09fmeiA== 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=foDdtnTpYX7KOKaEK3AaAbPoFVhLCYDu2WsS1Ux5kGs=; b=bYcD4TGOG8a/TwswhqYHDXiP00wlF4d/0AWjB95T3EqEf1DHss5nh8LzRvnwJCjK4DYln+6/whMLr68ootQa3xfFa7zBOFHnta3TYXqM90FUuv3PAF0d+J8lWHopvn/Imj5LrmmvY1xMHm869k1pTv8kqVjrZLlJw60ntwxapBNdRr6hOoMF9ohcksBNUuJo+laRlz0nUgicauQcLsovFPtNCOq16xbjVnR1YyUMVN5OT6RL1ILIhvzmCb3F6TxFd/gbougF9zwiONjYi8v2MuYPfLJ/UlypxlUGqw2vM3NsLHd/KDk34031WiqG4/S1cEW6yq+q3dG0E4Cctzk3Dg== Received: from BN9PR03CA0578.namprd03.prod.outlook.com (2603:10b6:408:10d::13) by CH3PR12MB8236.namprd12.prod.outlook.com (2603:10b6:610:121::6) 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:34:51 +0000 Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10d:cafe::fc) by BN9PR03CA0578.outlook.office365.com (2603:10b6:408:10d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:34:51 +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 BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) 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:34:50 +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:34:42 -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:34:41 -0700 From: Xueming Li To: Ciara Power CC: Kai Ji , dpdk stable Subject: patch 'test/crypto: fix skip condition for CPU crypto SGL' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:53 +0800 Message-ID: <20230409152529.5308-106-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: BN8NAM11FT017:EE_|CH3PR12MB8236:EE_ X-MS-Office365-Filtering-Correlation-Id: eb1000f6-9e0e-4eb6-8618-08db390ff58b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /hPo+1/9uku8PIcpDCqx3orM9FIF5UN3vLKXy5jclu+H+UxxsuVJfJcyFxyKZTBTweIaiaPz5wdkE19rQkTIMKgCaLxmS++3iJNMiQ4iy8D2qgbw9izs5JrJkZ3yGqFBRGYBnD7NvLm+/bJGv6kdns0a0GLJPYsET6OZxw1cEA+NSQdxSGEcWgME0TL3mj0TaBQxbOJUyepjHJ+dw03nGTkiUQqnfMnuRMfo8zRo7QaJHxpnpO02+XDjkLe6kvmeBrfLVjGxcds9xw8ptZr+x4ZXsq38oxl1lKPMUfxSOOhSaF/q0Hh0WEhzau9gY4JyMYH9c33hCK9rhAFjkMWq6ldUi2gfln6XRNPg3tHR3EPAL1oRSa/yRrUHG1T7YgtMqt4KmVwzmk2f96sPbpWsUgDOqFyqTFtZYAA/X6GZeFQAxxDgWFOZZ/K7Tym7q5tOiKroNNNceKgDromqa9KaoS6dQygHWYSfDmEYBTXrCG7dupZ3YRA42xtJ75bpHmaAuhl4uygKcimeF+XJUsIc1ihOkrcyn9tyGWrAiorzczCiTOI0amjKglIBQlpk4WfsPDMIKZ+HXXqXTndKuWE7yCGWSZW7GnhFLD7wJ0qxG4vIr9D38j/W4trKfisKHswi7Z1ztMPklwDtOy5rUgy9MQm/BXeWs3Z3SsLKMfHe0rGQfAkgcte1QNfctnisMhU4xLZ9V8hre9/COkIVr+zJD/Abfalw7aq0OKPHkseXGmZUtSAwy7zzotNS3g5nniTbMpFPZtpRnCfh5CbwcJnouo1J3iYDAm4C80AWLAVyb/fZ9qUSQkI8EV6PnnhOsDb22TWs39kzND71gGSTLbpUmA== 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)(376002)(346002)(396003)(136003)(39860400002)(451199021)(46966006)(36840700001)(40470700004)(55016003)(6666004)(8936002)(7696005)(40480700001)(40460700003)(966005)(5660300002)(86362001)(70586007)(8676002)(70206006)(6916009)(4326008)(478600001)(316002)(82310400005)(36860700001)(82740400003)(7636003)(356005)(54906003)(2906002)(53546011)(1076003)(26005)(2616005)(83380400001)(47076005)(426003)(336012)(41300700001)(36756003)(186003)(16526019)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:34:50.7724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb1000f6-9e0e-4eb6-8618-08db390ff58b 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: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8236 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/dc6e5405cac9a9908e1b2dc8b7d240099130c8f2 Thanks. Xueming Li --- >From dc6e5405cac9a9908e1b2dc8b7d240099130c8f2 Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Tue, 7 Mar 2023 17:17:32 +0000 Subject: [PATCH] test/crypto: fix skip condition for CPU crypto SGL Cc: Xueming Li [ upstream commit 8c33ed1814d52e8c5a7a5055cc3128e1414e5e8f ] When SGL support was added to AESNI_MB PMD, the feature flag was enabled. This meant SGL testcases were incorrectly running for the cryptodev_cpu_aesni_mb_autotest, and SGL support was not added for CPU crypto. Now skipping the ZUC auth cipher SGL tests for CPU crypto, and GCM authenticated encryption SGL tests for CPU crypto on AESNI_MB only, as AESNI_GCM CPU crypto supports inplace SGL. Fixes: f9dfb59edbcc ("crypto/ipsec_mb: support remaining SGL") Signed-off-by: Ciara Power Acked-by: Kai Ji --- app/test/test_cryptodev.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 6b09b2ab56..7be4bf40b8 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -6458,6 +6458,9 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, tdata->digest.len) < 0) return TEST_SKIPPED; + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + return TEST_SKIPPED; + rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info); uint64_t feat_flags = dev_info.feature_flags; @@ -7653,6 +7656,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, } } + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + return TEST_SKIPPED; + /* Create the session */ if (verify) retval = create_wireless_algo_cipher_auth_session( @@ -14455,8 +14461,13 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata, &cap_idx) == NULL) return TEST_SKIPPED; - /* OOP not supported with CPU crypto */ - if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) + /* + * SGL not supported on AESNI_MB PMD CPU crypto, + * OOP not supported on AESNI_GCM CPU crypto + */ + if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO && + (gbl_driver_id == rte_cryptodev_driver_id_get( + RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) || oop)) return TEST_SKIPPED; /* Detailed check for the particular SGL support flag */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.471240700 +0800 +++ 0105-test-crypto-fix-skip-condition-for-CPU-crypto-SGL.patch 2023-04-09 21:45:38.759042200 +0800 @@ -1 +1 @@ -From 8c33ed1814d52e8c5a7a5055cc3128e1414e5e8f Mon Sep 17 00:00:00 2001 +From dc6e5405cac9a9908e1b2dc8b7d240099130c8f2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8c33ed1814d52e8c5a7a5055cc3128e1414e5e8f ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index af3d89b9c7..f4648755e5 100644 +index 6b09b2ab56..7be4bf40b8 100644 @@ -28 +30 @@ -@@ -6542,6 +6542,9 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, +@@ -6458,6 +6458,9 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata, @@ -38 +40 @@ -@@ -7985,6 +7988,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, +@@ -7653,6 +7656,9 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata, @@ -48 +50 @@ -@@ -14804,8 +14810,13 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata, +@@ -14455,8 +14461,13 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,