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 5883245CE3 for ; Mon, 11 Nov 2024 07:40:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C4CD4067A; Mon, 11 Nov 2024 07:40:13 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) by mails.dpdk.org (Postfix) with ESMTP id C7C7A40E35 for ; Mon, 11 Nov 2024 07:40:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LB+ZTjCBWyC+cyOo8q6l4mpnFzEPO+vY1s/BV1QdA5llRQpaXzss2rm+i3aSDfuuaRgVxfCS6a8WodRw3Fnu8BUxTBdNOSc5pexoCN5tMQgLpDL5PAdTvnLza4LHZiGJP/zVxMhBOgmAUDXUDx4FjcLEAnZtLAqMGxqvNM9C5Tp5UVM8tTLZYzlVNoeth6DH8XQg0s2O3v1I6T+0Q3WQuXVmDtG/2mBkH9E8KeuIMZphPuFS3mi5ygt2YCAXQFK/1PwqHYK0y9mSxj+TCj3hElLLdJC+w0yFzkUwErn1AQ7d6gC3lDOclCQyt4iv/zzBgy9k0NKhzPSLaGYRMTgy7g== 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=CBmp8xiRkrTJcgPb9MdOVFMDaqWspDQjf19meZyGnFI=; b=fPitnaWX2dH6G6zIKTX5HXL7MfZWJbUxsAGXYpQRWPLEiwplSdGBgHZOo0jdv429AvOHv7yaF4ph92rbBY8NZyL937pM5pjwFIa3i40+TRUPka4biMqH40UBUDA7C686ndZqkUhWghfnGhcuYX6n4lEJzZ0/R9NjV1cNlkmCfQy864Iz/aG5FcDOOX1v7wW+u5QsQfeFHguNj6UOcSSbelTUy6XI7d85wQQYg2PHfVIeSuiU5D0MxWHNZn2pZXcaJQ4+OlRW5dK3oKbwpPKQe880JNoGULVEldVGKFCQLa6kmgvQ2NfJfU4sz4OkPhSxxmzVvTIGJrbpixch44MVMQ== 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=CBmp8xiRkrTJcgPb9MdOVFMDaqWspDQjf19meZyGnFI=; b=CLg9p6LC4L0asNzanz9wIKNxj1fCoUxUQw+J3uoAxDHjKywFmoPxwfzH6aKTRWQODp041GFp3LSx2M19Jgzus/x/Jaz+gx5pSnHVZbaZ3cKBhccLd61P1Nx+N0sCy0mSHBUio0NYjqlUSozrOblUYOLP+1iEb/wD19EMlmi7zhXxFnUCHdpszjKLgNeP6HEbqnD4icvgm1YKMuzCJZzgbrjPgV5tonqD7XnE1Rc+zPSiasrUHGQLuWsOIgzm9T+rZltqWNXizET1Jkr2GFADz/YvyXofHIjYaaFlxvwKeeSZPhWSF8gCfTBcwiGBxIc2r4YFo0eDJw5gusowPEf+Bw== Received: from BYAPR07CA0011.namprd07.prod.outlook.com (2603:10b6:a02:bc::24) by SA0PR12MB7076.namprd12.prod.outlook.com (2603:10b6:806:2d5::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:08 +0000 Received: from SJ1PEPF00001CE3.namprd05.prod.outlook.com (2603:10b6:a02:bc:cafe::9c) by BYAPR07CA0011.outlook.office365.com (2603:10b6:a02:bc::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26 via Frontend Transport; Mon, 11 Nov 2024 06:40:08 +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 SJ1PEPF00001CE3.mail.protection.outlook.com (10.167.242.11) 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: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.1544.4; Sun, 10 Nov 2024 22:40:00 -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:58 -0800 From: Xueming Li To: Viacheslav Ovsiienko CC: , Dariusz Sosnowski , "dpdk stable" Subject: patch 'net/mlx5: fix flex item tunnel mode' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:33 +0800 Message-ID: <20241111062847.216344-108-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: SJ1PEPF00001CE3:EE_|SA0PR12MB7076:EE_ X-MS-Office365-Filtering-Correlation-Id: f63ca797-7e4c-4b49-5314-08dd021baf6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uVUJJF2KVo0fSCNhz+QutgOOalVcaMJRjY/luZW5tbtfEKhxUPD+A+arPyZ1?= =?us-ascii?Q?D9efVcfkX+zAImzam8LWdx5LHRBweUQKMjTi2s0gBaH3HAm2C65ktcCqDgEs?= =?us-ascii?Q?f4CZcFv/5ZEzvtJgnOKhYgr1zSTSKx8EyteP9Le9wRaxl76honowmFMoM6iA?= =?us-ascii?Q?4kI1KJ9YYjtcHjG229BL998e6RImk7i9+FeSOTPGjwzCUwQsQCiNzrV/VFA3?= =?us-ascii?Q?aQXY7ZN89piUjiSKHi6E+i2bpI7bA5rV+a9T6ddkDxQ6HHdQKWnFXZDoG3Mk?= =?us-ascii?Q?Ztq6S5USV2oXODXlc8jQ0TqTjI4rBuZWFWrjYLUr6AirnarDEBQXIXiXLgHR?= =?us-ascii?Q?4weuVtPYQ7K7H3EZZdF3IYKq/D1uNpfDQ53cyo4TxFF4eUtG0mi180stGhb5?= =?us-ascii?Q?+5UsoKOBBwG33v/E3LUkJ6/mrgf9kgC//O1b/QWcnZJlIrV7PqNCX9s2o2+A?= =?us-ascii?Q?9lSo4myQeaV5cZnhJSBHcWanozEerirS8ZdEKUACdznOzramqrtik/cidNWQ?= =?us-ascii?Q?k7iDHEwnuIizxxv9OQ9PzjopkTKNodZwRrW5WWpFQ9bFiogu0sRmPe2C8waY?= =?us-ascii?Q?olIKA8aaxUfHogaFL43AtLjWQceUCS59f/5hXAloI92+JVUWKPV1fZb0d24G?= =?us-ascii?Q?00yg4zvY7Wyei9H4c1hXXaVglfzxnuacO/AauEDU+YC+EBY//mYujPRGefZo?= =?us-ascii?Q?UEr+JHc7OZGWw4rvlQKsIuvZDcDVBiLjqdmJ/ZEo0ZcHUwZl33PJO2X3rkP2?= =?us-ascii?Q?yT8YAI/LLUfcFV6eQyUguwInVubDodoHxMkqwrTgMML7MruRBvQDFBUAVFW+?= =?us-ascii?Q?DiOhAZqDiVnp5AhhKRQTK1oeUCZHL8kTYTFKRw7X5gyGNUBqMO05cBRKad1D?= =?us-ascii?Q?3fB6EckWftWIB5WYOO8dvTk2Ft38zRkFETFoaLwjJR1flEc7kPa+Ai7kaNrN?= =?us-ascii?Q?dN+9nnWJzRIjIFwcNuH64kP0NXCd4g5SdxDaxTkRsPn0imucarq8cljwBSlu?= =?us-ascii?Q?wHlh3C0LaW371QBrRaq750wZYrOLOvXkznnNATTNH44MFule7CidGFo7lkLE?= =?us-ascii?Q?+nEAKeGMqX51fMHJfD+rJPCunl86xRKKbD4kEtxDOCsfdF3WesMROvFwLxIv?= =?us-ascii?Q?PIQB61k0jL0WW6DzdBXhBLbAvbZQ5Tmv8H490j+02twhz4DzIJ8QiVbJbT4N?= =?us-ascii?Q?RJotZ5BYx44bnmw2Ssk5W0QZ4OIRZCyDgNQjA3ZQZlXvakD800uxFXntzXQs?= =?us-ascii?Q?PeVbCG6F2qElLXwLSZpo+AXTCPb+gKhg8/PnZ2sXpxYpRyvVroP6sZx6wZIE?= =?us-ascii?Q?ttNxhrulbwpqF67PuL0QyUOCwgSr5gyd6A8jzrliTjFgLJEDYOXaJ/P6faAc?= =?us-ascii?Q?0V8Snz8kSN+HYorHdHU5pVfY3EV625ELe7YUWuRP7P+nPSNtXA=3D=3D?= 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:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:40:08.6716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f63ca797-7e4c-4b49-5314-08dd021baf6d 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: SJ1PEPF00001CE3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7076 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=06b70793f9f1885d71895b16d648be571c8045c1 Thanks. Xueming Li --- >From 06b70793f9f1885d71895b16d648be571c8045c1 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Sep 2024 16:46:18 +0300 Subject: [PATCH] net/mlx5: fix flex item tunnel mode Cc: Xueming Li [ upstream commit e46b26663de964b54ed9fc2e7eade07261d8e396 ] The RTE flex item can represent tunnel header itself, and split inner and outer items, it should be reflected in the item flags while PMD is processing the item array. Fixes: 8c0ca7527bc8 ("net/mlx5/hws: support flex item matching") Signed-off-by: Viacheslav Ovsiienko Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index af4df13b2f..ca2611942e 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -394,6 +394,7 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) uint64_t last_item = 0; for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) { + enum rte_flow_item_flex_tunnel_mode tunnel_mode = FLEX_TUNNEL_MODE_SINGLE; int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL); int item_type = items->type; @@ -439,6 +440,13 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) case RTE_FLOW_ITEM_TYPE_GTP: last_item = MLX5_FLOW_LAYER_GTP; break; + break; + case RTE_FLOW_ITEM_TYPE_FLEX: + mlx5_flex_get_tunnel_mode(items, &tunnel_mode); + last_item = tunnel_mode == FLEX_TUNNEL_MODE_TUNNEL ? + MLX5_FLOW_ITEM_FLEX_TUNNEL : + tunnel ? MLX5_FLOW_ITEM_INNER_FLEX : + MLX5_FLOW_ITEM_OUTER_FLEX; default: break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:10.103428639 +0800 +++ 0107-net-mlx5-fix-flex-item-tunnel-mode.patch 2024-11-11 14:23:05.312192836 +0800 @@ -1 +1 @@ -From e46b26663de964b54ed9fc2e7eade07261d8e396 Mon Sep 17 00:00:00 2001 +From 06b70793f9f1885d71895b16d648be571c8045c1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e46b26663de964b54ed9fc2e7eade07261d8e396 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 279ffdc03a..986fd8a93d 100644 +index af4df13b2f..ca2611942e 100644 @@ -23 +25 @@ -@@ -558,6 +558,7 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) +@@ -394,6 +394,7 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) @@ -31,3 +33,3 @@ -@@ -606,6 +607,13 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) - case RTE_FLOW_ITEM_TYPE_COMPARE: - last_item = MLX5_FLOW_ITEM_COMPARE; +@@ -439,6 +440,13 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) + case RTE_FLOW_ITEM_TYPE_GTP: + last_item = MLX5_FLOW_LAYER_GTP; @@ -34,0 +37 @@ ++ break; @@ -41 +43,0 @@ -+ break;