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 C4F92457A1 for ; Mon, 12 Aug 2024 15:05:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFA264065A; Mon, 12 Aug 2024 15:05:19 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2079.outbound.protection.outlook.com [40.107.100.79]) by mails.dpdk.org (Postfix) with ESMTP id D1916402C3 for ; Mon, 12 Aug 2024 15:05:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vf8I9BJmraQp8nr8WRJezBKECqPSbb6ufQvD4VwHTPrQ7U5h+FIwpWii9yKv0jet5XQRy0Xfh7WRNNU+RfaCmk57d2HBVx1WG5jdpIFTC4jcVMZ8y6gwj8SSfRPRn3EtIsj532yDNHrcuPL1qsH/0edPfKp5b2GOowDyibXy6CYWwKXclxYU7/xBLN8MbI4QfRhax7GquitAG8+PjBSUqDpolDtspN6hVfUEV9KgqKCN6oMnvOlsrLZm75fTE7txApV9Iw+8wt0y5CeDiT+jCnByn5rwPKRE1bB0OkvygV4l4c9oxc5MZZ1HUpGo4VXgMj0pIeyaxQNY6pPHY5DGPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=8cxU3xLzmZjCWUCk3AuQKLQ+K1tmvo7gmpDI5aQCt4Q=; b=KIWGQ0bW0yApOfP5uN2/m+ZZgOkJSYC6W3lRbm6/83RhoU5ZJWFO8VkxiQUQI8U7RJg/q0hazTieSQhNkfl+lghIV9f+d1T4dZ0c7c27/NEmFv7/TsvwG70mPn+vkeioX6Fp+7JEGHcrN/sdxM18gfo2RPVa8ToscPhQCBE4jFd6AC2bbiPnp77+gfKCT9b4q72hT8l9KbYppzvI9yMMLPzV+pHy2aD5OGGvtQVTInby0I9Xk9yEaA6LquDqg5AKtKOG0LyvDuz1R63xvCmLh4tZvvRY37rn0dsaxtv22dGJeOBK4mwJxSHN+HO3XpfRccwu/IWdG1zzbz0hD5c/UQ== 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 (0) 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=8cxU3xLzmZjCWUCk3AuQKLQ+K1tmvo7gmpDI5aQCt4Q=; b=XsKEMOO1uPs2qk2SUQT1txZZjzVZ1Ab+C9xZNEuHoZ1bjfaqBqYVFl9ZDYpp6bCPH1hBzPhlE6Gc9wlJlL0RWSuoOjJfrKtYOvrasN4K+biJDxBZOA4eLQTBoaIvKPnlea3b7ypSKb0T6ea0jykKZco6beSSZLs41lVB7zu0wMCvjcTsboYuYLqiIO2ZnE8F2lfBkkKPZg8sGh3yAlB/TuhFgrCfTCTbt822+a5ITYV1kFGWRhV1B+RcQ6Y8Po88BFyQ1Vhtc4N4vVYVQMYTzLH9rRqLM+HaI5EUuxKUxiP9d+Xbj4CVDdQYYmSLEdxlpYSQXY6Rp1sQEerAqYvWYQ== Received: from SN7P220CA0008.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::13) by PH7PR12MB6955.namprd12.prod.outlook.com (2603:10b6:510:1b8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 13:05:12 +0000 Received: from SN1PEPF0002636E.namprd02.prod.outlook.com (2603:10b6:806:123:cafe::af) by SN7P220CA0008.outlook.office365.com (2603:10b6:806:123::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 13:05:12 +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 SN1PEPF0002636E.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 13:05:12 +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.1544.4; Mon, 12 Aug 2024 06:05:01 -0700 Received: from nvidia.com (10.126.231.35) 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.1544.4; Mon, 12 Aug 2024 06:04:59 -0700 From: Xueming Li To: Vladimir Medvedkin CC: , Radu Nicolau , dpdk stable Subject: patch 'examples/ipsec-secgw: revert SA salt endianness' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:50:28 +0800 Message-ID: <20240812125035.389667-152-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636E:EE_|PH7PR12MB6955:EE_ X-MS-Office365-Filtering-Correlation-Id: 7aba9d23-356a-4f18-6365-08dcbacf66b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+zdUCvwDYt9PR5RjWZ350auYqgKoujb+vNXGvt4CFvoI0BkSnieZrhRSjBT5?= =?us-ascii?Q?EelkgU8+DKMoKsBaaF30w22pxlz6vuRwgnMgY3vvk2hUs0qCoeG3USiVbTBu?= =?us-ascii?Q?YRKJf10clXv09VtpjT+tvL5PWDpSJTHBeMkQjlmE8xcoC7z+NCej+Qk6V3cw?= =?us-ascii?Q?S/IKyxrB5r+2RSk03THDZz+wtnKvAgzwp+7cRaDj56VnGCUQcp5qCCnUoIcA?= =?us-ascii?Q?+ZEAxW3HQh6viUbfFOWkepQfWfoVnqdeARUaFkgnQOVPe6RBs3HFLFDaVgqT?= =?us-ascii?Q?/Vn9LeRwvyd8TnGDHNPwOA4FV61yO1ojrU6nlh0brSvgmLhX6lah7/8Fl3yN?= =?us-ascii?Q?DkYC3+nno9PhznZ2qsFPPDkuQ5jkLyV2fkfeEuxUbHZCzi/XU1xP1wy4Xpt0?= =?us-ascii?Q?sb1afXALRUfY+r7/j5XyIT0v7ROX+tnEeAncspYQSp6coISWSEqplPKG47Oc?= =?us-ascii?Q?ORpCIvqSAfedKIbTmkHW8mluAw8KvKO48TesouWm58jh3V6LTgyw+R0fTaQr?= =?us-ascii?Q?yhucxdogrXD+I8CKgUlEYmW+bCs4VjiOuKl0nim5LSDsl0J7i4DE9zDoHI1s?= =?us-ascii?Q?suy8E/o69R6Cub7p1repab8/R2OfN9XV8HbL56P3ocLoszCGCNPXhnSETDPT?= =?us-ascii?Q?MRmlknEC7VxYdOxPxbfF/Bz3TieAuenUs7AHqRv0OCD9jsPfwRvdWiEe6qUs?= =?us-ascii?Q?VYlgiKsAY3C3o62GaVZh2pvITYuDC30sBdUk57+4Nj2JMvruce1DKf+Xr87w?= =?us-ascii?Q?JoluG8DdQNVVq7aYRdC6tFWuvmGYgwyt6Qq0Gs1g1WAUn2dNowiv6Bb3Q6af?= =?us-ascii?Q?QghlHPdK3uZC1bGEbK9Wwk36Va7DJ+q2nti7wn+aRnPWNwn7vGk0OvmkvshS?= =?us-ascii?Q?Wp3cWFSUyEZAu1PxfBoVVzbVL0GLWvYAEzStSaxpoyHxk5yHW8QZ/o21+wFZ?= =?us-ascii?Q?mjwRi+01AYbNnmGjF2rc2ON6wfSsttr8coJ3tmlGSIsbBiV96Vy8xbHgXQx6?= =?us-ascii?Q?4XOOY5EworOCibNAH+ZiPfIEIVelBBBiFSYL3WosMsgOeX0p6lnFphH9IPGh?= =?us-ascii?Q?v5pamPcKgWlkyC1ayoAHjBZhI9cDH8xpUsWwQx09tmE8hNQdSN4OgW3buYTN?= =?us-ascii?Q?uwKzlfcE+HTYirwa1W5FAKPVHNy6bz++eFDD3X3G/IsGDeicObxm+plM2gQd?= =?us-ascii?Q?+yCPKuQMRDmwGe71J89Gl5SIFtsVZ103nHHKt4Mvt0Eo+QwsWmu6Mt2p4XZc?= =?us-ascii?Q?bF0PFsZa+N8F7ZIGyFg0BCrtgchhdK6apUE7X5la+lrt2kBpVkUHTf9OLksw?= =?us-ascii?Q?clQsdopp0lJHOyWYEVI8hHRg5M9g6bZIl8kTTX7NxUCiZSxmFmmv+ps/9jon?= =?us-ascii?Q?4MlXDygWo3HqPpcNZ/5CsSA72Tj+CyHQ4Rbd0tK7hZgKMVUx23clBaXXRmO5?= =?us-ascii?Q?v2bAwvQ60id4LoPvB0Vqx7QqnjTYNJkE?= 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:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 13:05:12.2652 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7aba9d23-356a-4f18-6365-08dcbacf66b7 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: SN1PEPF0002636E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6955 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 23.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 08/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=613a4879b46c4171b7b63458c81937de20487831 Thanks. Xueming Li --- >From 613a4879b46c4171b7b63458c81937de20487831 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 29 Jul 2024 12:57:54 +0000 Subject: [PATCH] examples/ipsec-secgw: revert SA salt endianness Cc: Xueming Li [ upstream commit 7f9b2c926a5192440eaecf0cb80cc45ac8d9a0f2 ] The previous commit swapped the bytes of SA salt which led to incorrect work of the ipsec-secgw application. This patch reverts the previous commit and changes the type of the salt field in the ipsec_sa structure. Fixes: e6bfd9676109 ("examples/ipsec-secgw: fix SA salt endianness") Signed-off-by: Vladimir Medvedkin Acked-by: Radu Nicolau --- examples/ipsec-secgw/ipsec.h | 2 +- examples/ipsec-secgw/sa.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h index 29b9b283f0..649fb36871 100644 --- a/examples/ipsec-secgw/ipsec.h +++ b/examples/ipsec-secgw/ipsec.h @@ -117,7 +117,7 @@ struct ipsec_sa { uint32_t spi; struct cdev_qp *cqp[RTE_MAX_LCORE]; uint64_t seq; - uint32_t salt; + rte_be32_t salt; uint32_t fallback_sessions; enum rte_crypto_cipher_algorithm cipher_algo; enum rte_crypto_auth_algorithm auth_algo; diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index 7a90acaec2..6ae0e49fd7 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -374,7 +374,6 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, uint32_t ti; /*token index*/ uint32_t *ri /*rule index*/; struct ipsec_sa_cnt *sa_cnt; - rte_be32_t salt; /*big-endian salt*/ uint32_t cipher_algo_p = 0; uint32_t auth_algo_p = 0; uint32_t aead_algo_p = 0; @@ -509,8 +508,8 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, if (algo->algo == RTE_CRYPTO_CIPHER_AES_CTR) { key_len -= 4; rule->cipher_key_len = key_len; - memcpy(&salt, &rule->cipher_key[key_len], 4); - rule->salt = rte_be_to_cpu_32(salt); + memcpy(&rule->salt, + &rule->cipher_key[key_len], 4); } cipher_algo_p = 1; @@ -574,8 +573,8 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, key_len -= 4; rule->auth_key_len = key_len; rule->iv_len = algo->iv_len; - memcpy(&salt, &rule->auth_key[key_len], 4); - rule->salt = rte_be_to_cpu_32(salt); + memcpy(&rule->salt, + &rule->auth_key[key_len], 4); } auth_algo_p = 1; @@ -633,8 +632,8 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, key_len -= 4; rule->cipher_key_len = key_len; - memcpy(&salt, &rule->cipher_key[key_len], 4); - rule->salt = rte_be_to_cpu_32(salt); + memcpy(&rule->salt, + &rule->cipher_key[key_len], 4); aead_algo_p = 1; continue; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:07.260847122 +0800 +++ 0151-examples-ipsec-secgw-revert-SA-salt-endianness.patch 2024-08-12 20:44:02.585069391 +0800 @@ -1 +1 @@ -From 7f9b2c926a5192440eaecf0cb80cc45ac8d9a0f2 Mon Sep 17 00:00:00 2001 +From 613a4879b46c4171b7b63458c81937de20487831 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7f9b2c926a5192440eaecf0cb80cc45ac8d9a0f2 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index a83fd2283b..1fe6b97168 100644 +index 29b9b283f0..649fb36871 100644 @@ -25 +27 @@ -@@ -117,7 +117,7 @@ struct __rte_cache_aligned ipsec_sa { +@@ -117,7 +117,7 @@ struct ipsec_sa { @@ -35 +37 @@ -index 8aa9aca739..c4bac17cd7 100644 +index 7a90acaec2..6ae0e49fd7 100644