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 CC8DF43E57 for ; Sat, 13 Apr 2024 15:01:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C424E40E96; Sat, 13 Apr 2024 15:01:13 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2064.outbound.protection.outlook.com [40.107.102.64]) by mails.dpdk.org (Postfix) with ESMTP id 4E78C400D6 for ; Sat, 13 Apr 2024 15:01:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LCFZBdaan7CwTfygXLvoFs9djxI/Gw6Z/SK/iznok6eU+3QIo6v5GVKk8ZgciOrsyyK/vNx9bYNR4rWiOd+Vzvugn9Cjl6zpLeSIyH4LYDCUhgOnsvRuwJvAMA33MKPhpgi3qCyvR1ysPMJPQKPT249KTFS2ERZrterfPe/fdz3HWO1MZYoDVra+jbuEMaf4MbqmieYu/oLq3AosOSJqTQkmzlMAKX8CzVHPyfdnzU1OXVImIMO1SrNQYkwWpZozQkrq17aW/4FxoSYg4IArg4a3Jz3GNSCslwEXizpKsa4F+lOiQvAUYgMtGarnyaFk7Se3yQcu7mrfKTcAZ2DPlg== 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=/yTahNrdZUQGBFDM+4KUucfG+S3zFe2dRE+rSCIXHgs=; b=BzINyyDR0zchm/m5hz1+UPxPWFvlGUNU4BoMEVtHiRQIQUL6TIUebo3XOf5orIVqO5ZEXOn8U3E95oHOO6Yzuugjeo/m3sXUlUt6kkuP5b9JmQg4FFpDTlTuefeah83gPkiRGhoaOqVU6yy453Ieob38nuifKFSGxOxN4KKDuv6XX9LiPKF+Qku0Yi1mYWEWTVDEaqVglyciBT1cIbNiZ/jucMF7w5LQs59lJZ6doBvGAyIjYDipdpdmy8o7wtMioAgUtdzZBBm5iXlB3oVFfAVaewx13zT9eOP6h31QfShAbC7jWJbXEz1MOmfOWYtclaCIt4xFcxNi2yfIVMOmOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=/yTahNrdZUQGBFDM+4KUucfG+S3zFe2dRE+rSCIXHgs=; b=nb8xPKv/NtehnRxhq7+ybf2TCTMpBwdTEZVkuLYv8lBzBSaJdEe4Bhl6OJ0TBvR+sH3Bn/DeJqsvXxM9c2r8iyWvsbA8xXCVUykrjmYdGHFmGK74y4ozIUP+aP0PEnH/jDm0jBVfH1ObdF44OjsLZxdwDs/cHZBlExbOMcXd5QplFvJSHdofKx48Dhisv5K0bDEhqseaeQTAsEWV+HFtHJi+HnNqK/T1R5ni2KDztHbyalisZ+JoAzNDjru/yhDlZOE9PSA4rj/c3xExM52aumeG+VtaseOx0jora+KlnkqsSMpnXpzVp2E1QmxDwGk+TnhzoUGpf4I/xFKwOzN8jQ== Received: from MW4P222CA0001.NAMP222.PROD.OUTLOOK.COM (2603:10b6:303:114::6) by PH7PR12MB5806.namprd12.prod.outlook.com (2603:10b6:510:1d2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 13:01:09 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:303:114:cafe::e7) by MW4P222CA0001.outlook.office365.com (2603:10b6:303:114::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.30 via Frontend Transport; Sat, 13 Apr 2024 13:01:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000A6735.mail.protection.outlook.com (10.167.249.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 13:01:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 06:00:46 -0700 Received: from nvidia.com (10.126.230.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.1258.12; Sat, 13 Apr 2024 06:00:45 -0700 From: Xueming Li To: Alex Vesker CC: dpdk stable Subject: patch 'net/mlx5/hws: fix memory access in L3 decapsulation' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:57 +0800 Message-ID: <20240413125005.725659-117-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: MWH0EPF000A6735:EE_|PH7PR12MB5806:EE_ X-MS-Office365-Filtering-Correlation-Id: 435bf57e-b530-44af-33ad-08dc5bb9c9b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k4ylS4SM1xvyKq2NzAlGmXuz6sDQoeNNyGDe7GAnHClEjnmgKAA72AN3fb+3fXgLuuhLBSeIxfU+vchBY3ABVsF8J6ZlWewzf178T6ievah7mE2CJEqmjzofNqnsvLkehNcqXYIKzP/+KJWmTigbLLNzVt764+iIIN5qfMEoXfU67fRJ0MzLM7KtILW5X1CojlBSmaR05rTQM/OUZosOtgcOZ9RiGIKcZFjGxri4nJsROCL38220Bo+h955bJdbUShJbkhaIiCajjyfjNbHXQQVWGEz1TLaprkW2qBDGis+b+E69ZSF/1gcTLMsKd8DamJ5RZhNjkxhmpjVKUMjhD4a5nYYZZpCpXx93mHQwNn0OODHLqw0jLYx4qQKj/83gifgJYrkZZlHrUil16WRZfuOLG2+A3t3Ky0MY2ZuPuyQOAWQxlwX1hVJqNCRlMg9fn9fpTzIBj5P4ETi5jvp3NtxJ9rkJ/Z7NDsoHOuaRRgBR0XJn5O26Ws9We9K9qW09Yc9pS43Vhmvj2+r0Jdl3a4sj2CIXRvK3tqjrqRiWj/mykY0vYjcVA9YQ+kB6yyBKuilTxZUwqaGJSK7YqoBuM0XsHLet0q9RFZupevDytuI4iC7I2Bzpkm05lVksp6XSM4zphdjbgMKyf99din8RSutMqAz1KR+o8IeeT74wZocx4u8viTHg/pkBF9MTedJn+qOat6bOT/ooL1cY+f6hQOnh7bseJDQV173Mbc904thf+WsRggPFauF9qrMVrzSL X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(1800799015)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 13:01:08.9937 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 435bf57e-b530-44af-33ad-08dc5bb9c9b4 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A6735.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5806 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.1 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/15/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=aeebcd33c070db072666eb2dbdf587f3c0319a49 Thanks. Xueming Li --- >From aeebcd33c070db072666eb2dbdf587f3c0319a49 Mon Sep 17 00:00:00 2001 From: Alex Vesker Date: Fri, 22 Mar 2024 12:01:59 +0200 Subject: [PATCH] net/mlx5/hws: fix memory access in L3 decapsulation Cc: Xueming Li [ upstream commit 1738b65b89ba5c80c452cb9acdaad4af892e802d ] In case decapL3 action is created we would access header data even in case the SHARED flag is not set, this would lead to an invalid memory access. Fixes: 3a6c50215c07 ("net/mlx5/hws: support multi-pattern") Signed-off-by: Alex Vesker --- drivers/net/mlx5/hws/mlx5dr_action.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 862ee3e332..d21bca294c 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -1465,7 +1465,9 @@ mlx5dr_action_handle_tunnel_l3_to_l2(struct mlx5dr_action *action, /* Create a full modify header action list in case shared */ mlx5dr_action_prepare_decap_l3_actions(hdrs->sz, mh_data, &num_of_actions); - mlx5dr_action_prepare_decap_l3_data(hdrs->data, mh_data, num_of_actions); + + if (action->flags & MLX5DR_ACTION_FLAG_SHARED) + mlx5dr_action_prepare_decap_l3_data(hdrs->data, mh_data, num_of_actions); /* All DecapL3 cases require the same max arg size */ arg_obj = mlx5dr_arg_create_modify_header_arg(ctx, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:08.617256604 +0800 +++ 0117-net-mlx5-hws-fix-memory-access-in-L3-decapsulation.patch 2024-04-13 20:43:05.147753736 +0800 @@ -1 +1 @@ -From 1738b65b89ba5c80c452cb9acdaad4af892e802d Mon Sep 17 00:00:00 2001 +From aeebcd33c070db072666eb2dbdf587f3c0319a49 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1738b65b89ba5c80c452cb9acdaad4af892e802d ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 084d4d606e..562fb5cbb4 100644 +index 862ee3e332..d21bca294c 100644 @@ -22 +24 @@ -@@ -1775,7 +1775,9 @@ mlx5dr_action_handle_tunnel_l3_to_l2(struct mlx5dr_action *action, +@@ -1465,7 +1465,9 @@ mlx5dr_action_handle_tunnel_l3_to_l2(struct mlx5dr_action *action,