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 0ACEF457A1 for ; Mon, 12 Aug 2024 14:54:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01E2A402C3; Mon, 12 Aug 2024 14:54:14 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2072.outbound.protection.outlook.com [40.107.236.72]) by mails.dpdk.org (Postfix) with ESMTP id 920C14029C for ; Mon, 12 Aug 2024 14:54:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cWJND9lVBYQgWba40zWL+v9lkpcHiFymepToG9fffH4HNFS53WsrOv0kE71akcLXGb/ZAomX2uOBcOH8j++mo+KN7jogUGmlLfj67ABUwKu3cAJEF3NTmSV251UU3kindEswW1MF4AWg04FTr2rcojr/q31SdTAkx/gZdDdNHuLWDXDXfQq9JsvOck9SifMyznexUD0lnz7utWmtOmWsExcaCVQsXyQBjekg65emQGATzxLXkXeEvCHa2nIknlYkoekz8LdHtJWx+XFVVrRTS0wrVwVpYn8TOmSGYn4PR1djURtnIbdrzctqcD9tNI4g5Sd4qdC8/RaypH+rXjGmPg== 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=TZo/6l/aBRhWjVneBitv0ZwiudL2gcYuDN/9KMEDGyw=; b=Ii5E9xMqW4ojjPJP3tdOv2uodfyBeqJm/Qjw8aVHE3CUmWjX3gCOzb8X8sCljDdi35I5VQ8rsmd8nICbWGtLvXJYbzTwtYP5N3iUZ5rnUGWLtEJwQpxae3Yg1ochSTbjYkg+sFjDZ7FL39Hs5TXDHSWoHud4Yv9heQiuYs5dW9P9hE78RAor6iG85MlKSu2BM1fdD6nad63gWJjfmj5FQ77oFVVNWJOczwXuKeUzDzDsNEy+7663lcD2cBmGrabuAtvhn3qZFu9Bs8/sq2VkE2FdbVnWIrreNnYkSd5Rn2Tve4646sPVKBK727oUDtsPLsQdqsnRA7ylcjhpX6v7mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.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=TZo/6l/aBRhWjVneBitv0ZwiudL2gcYuDN/9KMEDGyw=; b=Xqmj7ytF0LzrBgQIwH+fRvuEsct3lt8xEem1Lewf0W5MpYMD6L1Ycv9Oh8fivZWMBb6tDXOmtlsQmTXs/1biBUXmer85f/emx/wsJdQOseVy212KMXMVE/uDOsLvcwpQpL4Cx05mR95Xf9cdF934ZpIHpvWW6f3WE2CPGFn/gtaCISOoN6OTPXiFn9mIPSWYWaKvn1FPjono7Usxf7pRrsf0x5J8LFINwr1UaUoHeONmrs6UxFClL9dbuWFNokyE2gaWkUe1MzXR/cy4+UplVHR0cUrpbmdjMNREIHSoTneg+TVWF6CvsbSaQJkL/uqcOFd9STWnZKvDbBpGS01jWQ== Received: from SN6PR04CA0098.namprd04.prod.outlook.com (2603:10b6:805:f2::39) by SA3PR12MB7904.namprd12.prod.outlook.com (2603:10b6:806:320::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.19; Mon, 12 Aug 2024 12:54:08 +0000 Received: from SA2PEPF00003F63.namprd04.prod.outlook.com (2603:10b6:805:f2:cafe::93) by SN6PR04CA0098.outlook.office365.com (2603:10b6:805:f2::39) 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 12:54:08 +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 SA2PEPF00003F63.mail.protection.outlook.com (10.167.248.38) 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 12:54:08 +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 05:53:55 -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 05:53:53 -0700 From: Xueming Li To: Shihong Wang CC: , Chaoyong He , Akhil Goyal , dpdk stable Subject: patch 'examples/ipsec-secgw: fix SA salt endianness' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:30 +0800 Message-ID: <20240812125035.389667-34-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: SA2PEPF00003F63:EE_|SA3PR12MB7904:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d5e3b8f-936f-4d6d-e80a-08dcbacddaf4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?aUtENjZzelJDQ2s1TitMQzF0QUt1TFBkZ25nTVY0MHhDNWtqWG9naVhlaGJR?= =?utf-8?B?eEJWNFVzMndFT3hXVjU3Y2FPdkRZZHRtM0NuSE0vRkhmNFZGUFFuWnFOM3lu?= =?utf-8?B?V2dGbHFnd01pWFR2ckxBQkJocGJWY3JFdElRaXpyc3R0MzUycmRGZGloYzd2?= =?utf-8?B?WFBJdU05YTg0Q0VzalNHek45RzRMOGtRV0o0bHBCK0lwME9QU20xNWdIR3ht?= =?utf-8?B?SGtJRFYzOVNyK0RubWtNL3o3SXkycXkyT0htM0duY1FLMFlabldmdnVTd1R2?= =?utf-8?B?S1MwZlBLSXVUYkpWU0VQM0hsQXAyZkdiaUVLOG9PMVZ2dFdnN3NQSkRtQlps?= =?utf-8?B?QysrYnRyYnBQbkRIREtLbTI0K0NrbjFuTlEwcnE0eFdRSEVremlEOGV1TWdj?= =?utf-8?B?UXJTbyswbVllSThkTnRHN1o4ZGdYTHN5S1VhU29VT1VQdUlKTHlHZ1lvRFQy?= =?utf-8?B?UWxGdEpUSnpyWnR1dU85Q3VpeWhuVFBmcDRHd1hTWVVRRHZQLzhLbkdZaFlJ?= =?utf-8?B?Wm10NGoxMHE3dkxhNk5OaFhIbGpnRC9nUm4rQ3lER1NTT3NCcHZUY0gxWXdq?= =?utf-8?B?U3V0ZzVtS2hnZVFNcXpCanRvZGhLSGRaaTdxSk5Wd3ZvcjFXVFNGOEwzSWlI?= =?utf-8?B?aDMwTEdRZUdwb2Y4MFFNUEc4eDY1MWVoQ3I3YXh1dGE2SklrSHV6MlpsR3lu?= =?utf-8?B?ZlhWZXBnTnRxNUx4bmc5ZkxpY3BIYXlJRFpSVmJJdDE3SkhOWlZYSDNyMFEx?= =?utf-8?B?Uk9OMnJwV1lWYWtPZEJkWkVkMFM5QmxLVmJkV1MyUk1xOW1UK25PV3NwRExU?= =?utf-8?B?L0ZULzBYZXBPTkErd3RHaENWck04MHBzMUM0aGtFS3J1TjFQM3lzNW1GemxQ?= =?utf-8?B?RjVtdjdabVo1dDIwQ2NKUEsvUXlsTXlEZENQWXVrYlpnVE9zQlR3S2gwRkdp?= =?utf-8?B?YWRXN3lLYmpwaTl3V2VaeVVuWUpsNlBFclEvb1hBTU80ZlVwVXUremtUZFpn?= =?utf-8?B?azNYb2taRkpCNHo3bC81YWc2V00rSnoxc2o0YkIxa1hyaFV1ODJnbzdmcThY?= =?utf-8?B?V1lBYjYxbnNjZUlXMHRuam1VL09OdnBJU1NOdml6WUVIVzRuMEpRWGFBVmVm?= =?utf-8?B?SGtwaElEU3V6TGxaaUxpeVAxYzJ6eThUVXRJaUl4QjVmb2w0V25oZjZIL0Nn?= =?utf-8?B?aGpuNTNqcUZkSGJiblIzU1NTWGFwb1JmaURvZ29ScGF6dU8rNkcvNHNCUExQ?= =?utf-8?B?MDNYMzlDNkRqVzJmNGwrQ2NueFJITEM0aFIzY3N1SGttLzlJT3B2Tklta2s4?= =?utf-8?B?Tmw0VWd2VDBiYmhaWm4ybFlNckRQYyt4SmdidFNOSG9yQlF5blNjZlk2OHBP?= =?utf-8?B?WDhrVDAxVUU4SXNJV2szUGVPR3UwamgxbTRYS0JiT2l1dVBsd3p6WXBEZUJK?= =?utf-8?B?VE9DSzR2VnV0WnFxbmZZZ0loMmZSK0tZYk1mWWR1YTU2Tyt3QzhTcStBcTdr?= =?utf-8?B?SDcvT0hHeTRvRms5eXdNNkxScU9jR0YzMWdkY1Zuc2xXWW5uK3prbjg2dG1X?= =?utf-8?B?ZVR0alJidkg0TGwxQ2RrZi8vQU56LzQ1QTJtc05PQ0JZcjV2S21RNVZabUZR?= =?utf-8?B?YWFFbFVJdzFEUXphdXNmcTcvYzhaeWdCRDJjZ2dhWk1mdnRVc2w5SjZEai9h?= =?utf-8?B?ZzBHalB4cFlQOGx3aWM0NE5QRDI4M0NpTWJ3RlI5RnFNV1hOVVhtdm1DQ1hZ?= =?utf-8?B?NTBnaTdsek1aSUtvOElkcmhHb0FhRzEvRmxRS0lCTGVsY3lBRnNiT1l6enFE?= =?utf-8?B?TkpOMGlxRXRuN0g2KzhaT3k1TjJUSlczMUgrMlJValFEOUdGbG9Fd1BSdm5G?= =?utf-8?B?OXl4eUk5VjExaUpjSFpMRlZFK3l0SU04dEZrR0tqcHFMV0tmVEZwMVQ5b0ds?= =?utf-8?Q?ys3ByhMKWJ/OXGvRBReJpVhJaA1SkkAP?= 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)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:54:08.1969 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d5e3b8f-936f-4d6d-e80a-08dcbacddaf4 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: SA2PEPF00003F63.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7904 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=427fa0723877511e4cb6c98f70ca5e3689aa5d02 Thanks. Xueming Li --- >From 427fa0723877511e4cb6c98f70ca5e3689aa5d02 Mon Sep 17 00:00:00 2001 From: Shihong Wang Date: Thu, 14 Mar 2024 10:00:52 +0800 Subject: [PATCH] examples/ipsec-secgw: fix SA salt endianness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit e6bfd9676109f904b4f263402e77105fdca8e67c ] The SA salt of struct ipsec_sa is a CPU-endian u32 variable, but it’s value is stored in an array of encryption or authentication keys according to big-endian. So it maybe need to convert the endianness order to ensure that the value assigned to the SA salt is CPU-endian. Fixes: 50d75cae2a2c ("examples/ipsec-secgw: initialize SA salt") Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms") Fixes: 501e9c226adf ("examples/ipsec-secgw: add AEAD parameters") Signed-off-by: Shihong Wang Reviewed-by: Chaoyong He Acked-by: Akhil Goyal --- examples/ipsec-secgw/sa.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index 6ae0e49fd7..7a90acaec2 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -374,6 +374,7 @@ 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; @@ -508,8 +509,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(&rule->salt, - &rule->cipher_key[key_len], 4); + memcpy(&salt, &rule->cipher_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); } cipher_algo_p = 1; @@ -573,8 +574,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(&rule->salt, - &rule->auth_key[key_len], 4); + memcpy(&salt, &rule->auth_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); } auth_algo_p = 1; @@ -632,8 +633,8 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens, key_len -= 4; rule->cipher_key_len = key_len; - memcpy(&rule->salt, - &rule->cipher_key[key_len], 4); + memcpy(&salt, &rule->cipher_key[key_len], 4); + rule->salt = rte_be_to_cpu_32(salt); 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:03.599770113 +0800 +++ 0033-examples-ipsec-secgw-fix-SA-salt-endianness.patch 2024-08-12 20:44:01.995069275 +0800 @@ -1 +1 @@ -From e6bfd9676109f904b4f263402e77105fdca8e67c Mon Sep 17 00:00:00 2001 +From 427fa0723877511e4cb6c98f70ca5e3689aa5d02 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit e6bfd9676109f904b4f263402e77105fdca8e67c ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index c4bac17cd7..8aa9aca739 100644 +index 6ae0e49fd7..7a90acaec2 100644