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 E94AE45CE3 for ; Mon, 11 Nov 2024 07:40:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFC714067A; Mon, 11 Nov 2024 07:40:08 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by mails.dpdk.org (Postfix) with ESMTP id 5745A40E1E for ; Mon, 11 Nov 2024 07:40:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KObqXVrwC7BWv5I2Njpq+7ioahUN521UhXJllREpzvK5TMTtCRW96lVdR17iGJhtD+qFzA+dYnl17LJyejpL6yX7sebOrab7VxeDhCavTds+837c7q5N7C0jgPLE8pBwWiaBCPiUkIHQm8NL5bXBjwvZXHrH+2SoH9C/E6jL34EIHjJB3z3eV4dwjqI2djxtvl2I0ytQdlm7vHKlr63FueL9ftYkQ+92ro06edE4favwOfRD3eiPwvl0GCNpAbxSQ9sJjGusP0Ioov7M0Hbep54R7D/QnFDd/NnC+i2Vhxp8VQAp+hwlmrXcZrUiVPLMwrNNeD3JGLggcoBazbF3LQ== 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=wsvMRJoM2zCN9A7QhdlNlk/6bw50U2hoAOQ3Em2ETkw=; b=dkwy1b/l+LamQnHby7gTmvRXspZE/KCBERPHk6p5HfC2k6alKDECbWM17Z9diak/8mQmhsLtxydTXb1BOfc3XrcVT82J+C9En5bqq0c9CrVgxcXnJgfzoKjkTjxQctdQu0iR6dlYH2IItOSI3I/kQqzxonV0Sp0J4dYW1aIn+50qZwOURJ78cPRKHnpSqwfu7c7qG3Uw9FNbOLnhC/q1x4beJxu28KXqmNqJadsCTNHLuBfgqLlS2bZiDsrWqnUjnZOlBoeFdgRHxQhmMT6GXDlalsKcr8pofn7gc8hIkDxTYSEdPlmkbt4dTZLpasOJliSN6nuqtn4yUn9tC+bwCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=wsvMRJoM2zCN9A7QhdlNlk/6bw50U2hoAOQ3Em2ETkw=; b=WvdGUETKQvOEReWHH9Ceg+8N97wE3ll5UTYZrSLJ9It4DL+n7CZ/UqHvt+f5E31vdL29b+ovg2RVG942LxLiOppFzFSaXTFcn4PHlgh5QkiW2BUrA1S8pXViBju4cOaCmhI/KUDeHkhFj95t7WW9rpsM1i9SMfY8ITVPdMUFumvQGzafdho3iqh297HtOj3pzsCDd2BG9wsUcdrIUKrpQS5YPVvqlnPLE07KLWpYsw/1qOxAAgOgH/f5ofmwZvGOoMm2/qBKwsLeUMQkjJLs8HCvRg/RrXQ91lZfwW5Qz7yhZDWQJ6G+hKwwe90vxvM7rV7YE/UKMMO4cSV3/T3xmA== Received: from SA1P222CA0041.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::15) by SA1PR12MB7270.namprd12.prod.outlook.com (2603:10b6:806:2b9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:40:02 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:806:2d0:cafe::ac) by SA1P222CA0041.outlook.office365.com (2603:10b6:806:2d0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:40:02 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:40:02 +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; Sun, 10 Nov 2024 22:39:56 -0800 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.1544.4; Sun, 10 Nov 2024 22:39:54 -0800 From: Xueming Li To: Viacheslav Ovsiienko CC: , Dariusz Sosnowski , "dpdk stable" Subject: patch 'net/mlx5/hws: fix flex item as tunnel header' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:31 +0800 Message-ID: <20241111062847.216344-106-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636C:EE_|SA1PR12MB7270:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e34f5de-6b78-4bde-f364-08dd021babc1 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?cC/T3sZCNMkS/EWU8NmJ/iLRXjYVQKSCFkeyFWlkKXjFg+vsTKAURPbeUtIY?= =?us-ascii?Q?EL0CU6XEUXPNM6uyDTaYjs25cAcDSHnse+iqiqrqaJRLPO28Io8LG+4FjYGe?= =?us-ascii?Q?mNqFY9mxn3U6X4YvRXr7aj0XcurjzREWQARZvD63mFtEd8ufytl76I08Hmct?= =?us-ascii?Q?DM2TNSZqHGctiIrAxUTpON8poMBKWx2YDp/GYl70gO1aKmq3C3ZGNNR9YQQB?= =?us-ascii?Q?PJaTrFEsdaVsmgOqkzwqdqooQViAaZcQDVHTITQu0nCb25BDzSZ2kv8tfv8D?= =?us-ascii?Q?rFnWFnPmeu8inzxg2pai4avtpmj7HLG//rdlxK4eQojL5ueW9B8Kmr3FcPSj?= =?us-ascii?Q?CMezUJLyStUANPp6c0GDz9P6Mb9RwoO8MLLJFiDIC85f/5LYLm62UxJLj4e+?= =?us-ascii?Q?n17GjIzj+BGzD37wwABYtY/rEp/EhusiPGL33aRDPW/gGgq4+k7xsQCO6RCS?= =?us-ascii?Q?BV/ZTUwOBnIkDYYFAiumZ2MBqtWDxNZUIZu29TTfdp9sVp2op8losRDSl62M?= =?us-ascii?Q?scsZoBbzkxySkfE3gXHjk2c3KhQTihnF5oM6vlVESEUrFGufTDHDafI2xIqD?= =?us-ascii?Q?2tPSf+f+DXDNtVIWlGnXLtZ/LzO7U0mLdDEoqqG5h3fCglU3oRFKg/0mtxUx?= =?us-ascii?Q?3B3gkUI5CrScVk/P98aqbQd8MXZmOFq1tqUQ2mZqSjdP4S/7y1WbXsmzvcC9?= =?us-ascii?Q?QyVNSiRtcvZ1DNyWfh8A1ujpLp0AKu14HlMrsFwP8EOxLOLXcLcx/ysXf4Qr?= =?us-ascii?Q?UFG1xisV/RTUpXT5Xoz3xruCvMOmhpnU+e3raGV8rkCUTR/SMTwh8f6fMw1Q?= =?us-ascii?Q?fyJhoDK+xh7DF+aYThyEXfFrIfCl544HCXOnHHwW07pJ4DNoPg8RvLbwrusF?= =?us-ascii?Q?bbC8OAtawZgTiuKgFGyQ5Z1D4kQ/h51pI4JIQcZF0DPwhY8WdRDqA71Io2el?= =?us-ascii?Q?LNgpRrYBwms+TDh3nxCn7ZGnT83Vb8RfoTKl0XNm9Ws/Vc8G+vIf2u+s7P67?= =?us-ascii?Q?LIej/M5TXil2uJf6IG4Lmlm7vbqCjoa634sdlgqm4UTqoRQ6cka9RieQHwqu?= =?us-ascii?Q?pJFPBUbF3N9JuM4MioTgYZvU2qDyIP8G0HDH7SBpaD4YXSPA+FG0Ltr411f2?= =?us-ascii?Q?JlvfeaBrGwiZ6t/9BpefU5TfgHumHS8GK4AEbPwsRiy9pt6EsjNXXkoDU+Bx?= =?us-ascii?Q?RuiL6kZLJudGZHz58oJS8O2GPNBVlsYhmOxAK4nEuE8+Ekd67C06mheTdIH+?= =?us-ascii?Q?53mD7pwzZtl5ibAjNWXTELSFFsS6WzxOG6ejvstc8lWyxwAYaw3fC4ERTdae?= =?us-ascii?Q?oofyEA2sP7/R0EgFHDH4kde/flRXPxovgChkk0n9BVXkljmrfPCqrJSJC/5k?= =?us-ascii?Q?gNyOxcH1XL+Voh1bsTdV7Yx/7PAv4T0rZkn3hce0xTbSxnVSmA=3D=3D?= 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: 11 Nov 2024 06:40:02.4059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e34f5de-6b78-4bde-f364-08dd021babc1 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7270 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.3 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/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=f64e2a1e86b8b85627b7ce9563278eff71e26c8b Thanks. Xueming Li --- >From f64e2a1e86b8b85627b7ce9563278eff71e26c8b Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Sep 2024 16:46:17 +0300 Subject: [PATCH] net/mlx5/hws: fix flex item as tunnel header Cc: Xueming Li [ upstream commit 624ca89b57550f13c49224d931d391680dc62d69 ] The RTE flex item can represent the tunnel header and split the inner and outer layer items. HWS did not support this flex item specifics. Fixes: 8c0ca7527bc8 ("net/mlx5/hws: support flex item matching") Signed-off-by: Viacheslav Ovsiienko Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_definer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 031e87bc0c..1b8cb18d63 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -2536,8 +2536,17 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, break; case RTE_FLOW_ITEM_TYPE_FLEX: ret = mlx5dr_definer_conv_item_flex_parser(&cd, items, i); - item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_FLEX : - MLX5_FLOW_ITEM_OUTER_FLEX; + if (ret == 0) { + enum rte_flow_item_flex_tunnel_mode tunnel_mode = + FLEX_TUNNEL_MODE_SINGLE; + + ret = mlx5_flex_get_tunnel_mode(items, &tunnel_mode); + if (tunnel_mode == FLEX_TUNNEL_MODE_TUNNEL) + item_flags |= MLX5_FLOW_ITEM_FLEX_TUNNEL; + else + item_flags |= cd.tunnel ? MLX5_FLOW_ITEM_INNER_FLEX : + MLX5_FLOW_ITEM_OUTER_FLEX; + } break; case RTE_FLOW_ITEM_TYPE_MPLS: ret = mlx5dr_definer_conv_item_mpls(&cd, items, i); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:10.026742840 +0800 +++ 0105-net-mlx5-hws-fix-flex-item-as-tunnel-header.patch 2024-11-11 14:23:05.302192836 +0800 @@ -1 +1 @@ -From 624ca89b57550f13c49224d931d391680dc62d69 Mon Sep 17 00:00:00 2001 +From f64e2a1e86b8b85627b7ce9563278eff71e26c8b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 624ca89b57550f13c49224d931d391680dc62d69 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 51a3f7be4b..2dfcc5eba6 100644 +index 031e87bc0c..1b8cb18d63 100644 @@ -23 +25 @@ -@@ -3267,8 +3267,17 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, +@@ -2536,8 +2536,17 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,