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 D9EE845CE3 for ; Mon, 11 Nov 2024 07:40:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D114C4067A; Mon, 11 Nov 2024 07:40:44 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2050.outbound.protection.outlook.com [40.107.101.50]) by mails.dpdk.org (Postfix) with ESMTP id D5EC04067A for ; Mon, 11 Nov 2024 07:40:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UAyZd7k6ZCZDKYUsATUrBt5bHmkRBjtrSSJ10IATaRQTaelsVwyk3fly1gEUxIVeRz8F5br2WLLEXEfxD1Vd7ipLmQYXA3o7tVNXSov/+2nMYZ+uTjcyw5joSk/eSQ5ugQwRAwDCo5M3J9w4moerircdQxUB1OzvpM2nBH7EB7OIGMM9WeKqK7t9fM8n5MAppTyvfErXqM0jsZxpV+NEkGsC1nkZzRoIj/o64Ah+1KhDHxWVIpNPyrK35i/rRqeQI9QvgAJFv9OaHJYUBfiP+1K34xx9aSj6J/u5WwX/yxq2E/nVZ0MNRgHBJsMYBs+GNfiKVS7f656bX4RL4vKMeA== 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=yuS9Va/Rx1rygb1AV81lPf9sK5IaV7TZpIuk1uxpgPE=; b=mQfWOwUueOdxmrLViFGgz9xznaOkpjJu4l8NZtqTM3PnKouXZR6XWltOdR1GpzE6aYy1pbebFqScCI9iaBLJP9SgW7f1p+q+2t/PGu+4HPEvEFPnFA+3jqxvWmescAhRw30jzSCsh/dcH//EH3/2u85X/xuWm97BOLE1k0ERLKyjuzCKVK6QY3X+wzQ8WRuIq+s1//IcKLtYSEyjqyS8t7spqeWg+wQSS1wHe0dRDYmN7P0dc+/MyMk31nJaCViuGVNhrDJ5rHTgWWNEetgkhU7JsObIgCI79C4RVORx1bH954zGTDKOBOcin6YXa9Bd4Hkw71Bub28Gem95SV6SiQ== 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=yuS9Va/Rx1rygb1AV81lPf9sK5IaV7TZpIuk1uxpgPE=; b=EN1aa+0SY0/7r45NbGcV2R1+lqTlyo7nNkRitC9do31pbbqoK0kZ41pFVvPPtiRK99g3jmcm6OH1CN+WDBNpxpXc61StwXYmVza7v6npK9l57wRKjTxhCGPpboIFn5LHna75mlN4eHMg8WCu+lTWEZNBBvuoUEmVYcJx4SY2r5TL9iSRp+K4vKDC8EfZWv89fWRcEcHUx09mWM2KsEN5OIdaJbHRPoNNsMwH92zHraHBL9wAFU9e6lAHeXKDPJgvkn8uY8rZD7X/6hdX2A/x5SZXy5oDH6OEP/CT8SIAlEWpGFDrCt0aNyJsiobRIgT4Baxggdp57NGwP1rFnjylDA== Received: from SA1P222CA0048.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::23) by MN6PR12MB8471.namprd12.prod.outlook.com (2603:10b6:208:473::19) 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:39 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:806:2d0:cafe::d0) by SA1P222CA0048.outlook.office365.com (2603:10b6:806:2d0::23) 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:39 +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:38 +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:40:26 -0800 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; Sun, 10 Nov 2024 22:40:24 -0800 From: Xueming Li To: Viacheslav Ovsiienko CC: , Dariusz Sosnowski , "dpdk stable" Subject: patch 'net/mlx5: fix next protocol validation after flex item' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:36 +0800 Message-ID: <20241111062847.216344-111-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.231.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_|MN6PR12MB8471:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a2128eb-299f-49ed-d8e6-08dd021bc185 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: =?us-ascii?Q?kfthXx0wClxKAgEklfABjkb/2FquTYZvRPBSKaNHGGKkeFMgjKnw7E7igq8Z?= =?us-ascii?Q?5Oeqig1NkQ12V/3ChwlIuI9U2ucJkN8MXamjLX/GLFSuCjAQRaaHS1Kk6mHm?= =?us-ascii?Q?fjv0SfHAN6EQsgvPOK0tqBL1i4XlivOJKWb/QQch/ZGi/37J020Y3Y2N1/eu?= =?us-ascii?Q?J0SOZsKn0OxojVg067ZZWrWzkzbOQgIn5guRVo//uqpQ3LjF4xDyC4kBFwZ+?= =?us-ascii?Q?mqPN0GTFfl6xmx4z9QJpZuLXi2aI4o5WQrgZVzr1yDNJvYWLSHddIBuzv8Rz?= =?us-ascii?Q?VWcUYK82ssCpdOzyrdcKSkpyPoEhKX46Iffq7uornqW4WQWShZjJYvO7Vism?= =?us-ascii?Q?hpF3AbrffslxlgSQi8Gbq8k53WBnCK8h16eizvMfYPsPWZ1YGcEw2er3o4tL?= =?us-ascii?Q?6pH5XEFRyDmgh1JFCQfZ7Ko1//T7CX78/OmDhp7N6uDxitnbQYq942E9W+9Y?= =?us-ascii?Q?Dec7Lw9ZBRarxIUwqfyN/XRarAZRXxqdqMNmfuEfiPwdoLF2USvm5T8kawic?= =?us-ascii?Q?qz1TDDXKmucApMbEw5ehaVd1cZuAr5n05Yc3NKk5BLcJq6xDt7jULSzXV8XP?= =?us-ascii?Q?wMov9gyBp3T/p2bdx/S84VOW4A2Z9gkaes7fLU2yRewBaumKl8Dyfyi+ud74?= =?us-ascii?Q?PK0bDlfHbV+mOLVte4dEDGnqhuBuYeoSqLOJ3pz1WrDBaTrlU07d3rm0se2N?= =?us-ascii?Q?03jQjYf1G24o+u+zbTVm15cCU9tCg7NNq2KIOj93f2fhJFN8lBthe40Q8UNY?= =?us-ascii?Q?civEbQDhB4TEnAZZbrqXoh2QAnt05tmEAaCXApSLtb1yhq9LfRNY5Emrmv+N?= =?us-ascii?Q?wdAmWoaL+p+yCXvpeCoyJ7X0x5PcD7hcJqXW895XCp0yLtxI6maOPlPOrq3g?= =?us-ascii?Q?JGh8YQYAi+Bg6eMAPHcEvT64iKBhsJ8hzE6xSEHNPbNntY3/3oGZwQnqBv1X?= =?us-ascii?Q?4SKKpG8zWzyFwhwI2biJY27pP+y+cQF3ykPjUhg05QqI8C5+eRvxiKnV5kUq?= =?us-ascii?Q?2cmR3fQEApuRJaq0Fcyp8qRu5mNqRGH1h2UDgmgsxTfutaT4eRms0x2WitIb?= =?us-ascii?Q?aEyI+6XaEHkKOtu+lM7A0jczh31YJdHkJuwyApq6pk1azL/mbvvH4W+sl22F?= =?us-ascii?Q?lp1Vz1f63lV/A8v9PIW91x5ubp0yyrh7YUDdtlXchobQK4d2TfTBROV2KIot?= =?us-ascii?Q?/phgqVIqLfdK1i5HQgINDGwhdVPbSw6P7YB7ZXyji8tTbq9W35C699bCzYwq?= =?us-ascii?Q?Y+nf/K0DbirPmaOMPAoMMK5N9jQlYvHvp4fjEbz1v9RIpWd/a8tr26X8qihG?= =?us-ascii?Q?ymJNSVNNgczgyDeVWGRNVeGGgGfX7r31cSmQ63jK54tFtuC8NO5fxchb2Nss?= =?us-ascii?Q?mt9jB2i4w2pD7x5Yp/E2dLqbVgUW08hyT+RhwBxJpiLoSmhYIg=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)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:40:38.9531 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a2128eb-299f-49ed-d8e6-08dd021bc185 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: MN6PR12MB8471 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=e03621f4c4a16e42b913431bcb86caecd3240865 Thanks. Xueming Li --- >From e03621f4c4a16e42b913431bcb86caecd3240865 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 18 Sep 2024 16:46:21 +0300 Subject: [PATCH] net/mlx5: fix next protocol validation after flex item Cc: Xueming Li [ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] On the flow validation some items may check the preceding protocols. In case of flex item the next protocol is opaque (or can be multiple ones) we should set neutral value and allow successful validation, for example, for the combination of flex and following ESP items. Fixes: a23e9b6e3ee9 ("net/mlx5: handle flex item in flows") Signed-off-by: Viacheslav Ovsiienko Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 863737ceba..af6bf7e411 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7850,6 +7850,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, tunnel != 0, error); if (ret < 0) return ret; + /* Reset for next proto, it is unknown. */ + next_protocol = 0xff; break; case RTE_FLOW_ITEM_TYPE_METER_COLOR: ret = flow_dv_validate_item_meter_color(dev, items, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:10.231892736 +0800 +++ 0110-net-mlx5-fix-next-protocol-validation-after-flex-ite.patch 2024-11-11 14:23:05.332192835 +0800 @@ -1 +1 @@ -From 3847a3b192315491118eab9830e695eb2c9946e2 Mon Sep 17 00:00:00 2001 +From e03621f4c4a16e42b913431bcb86caecd3240865 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3847a3b192315491118eab9830e695eb2c9946e2 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index e8ca2b3ed6..4451b114ae 100644 +index 863737ceba..af6bf7e411 100644 @@ -24 +26 @@ -@@ -8194,6 +8194,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7850,6 +7850,8 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,