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 E0A8146A63 for ; Thu, 26 Jun 2025 14:09:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9AFC400D6; Thu, 26 Jun 2025 14:09:34 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2085.outbound.protection.outlook.com [40.107.220.85]) by mails.dpdk.org (Postfix) with ESMTP id ADAF6400D6 for ; Thu, 26 Jun 2025 14:09:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VyRk+FkR5wfWiwSoClZz7A6bSY+X2woM9GQJTaylXpNlQU0CIXSWXgpW8tAOD85z5SLwYjkC3KNOL2fiJRfMt83DsZ/x+B4IhGnOhpOn9c7oojkySVTjnzsi/FlgPchwl/hSv/l8nAIkGGrGZHsqYQ8KXgkZQs8OCDV1938FMxo0tJSOCeyefXH2oRm96WqKd/m54rGk72ZGfUSbdh6I9KZyPiDw1Ls/YAaCSJRe4+kXuQQ5kFvYFsyNbsFCR1ueRNkdVT2PWbjsUsxRjpPfENX+NXGezaWKBG6jvrtadjLPvySlUO/cBT1agnNV5DUCJzSZTq6uNhE1OZzg3k50Zw== 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=9nzhYw9CBzJeNOhSf0kyOpJp1QljLhEznRFg1eYeF80=; b=dMXR/aTWGkg8WyM+Vc+TpILe87tpXWaRETdVtbRxHNqipNcmbW39diUNrMN/hkIr9UE9VsshiOqkuU6NlgX0ib0Kvk1Xei2y+Cl/Ug3f4h6JlDwzCkctIcArRcWZVRgDLrT6amPwzpGQ5ig4R3gJl3sAixyGSu4CLxHC/K3NzaIcJbJY3aPeb3X6hExKoW8sSdqJdwGdJd8lF7M46DGFL5IZdXCl31NiFjaSmeBPj6/ipiDnpL1XGzW1emXwtYmb39Mss/658yXxz9Y6gd6g/KdOW8y9dbNP6TPS//nT/K1bxOVkplJEFLNTJh2/YjiX9PIqyzJ7+yKxOq1FSOeLUg== 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=9nzhYw9CBzJeNOhSf0kyOpJp1QljLhEznRFg1eYeF80=; b=Y0AkhzHBinDfETR1mOX7Lth5aFA+BAYeyfKXbhHf0dUe01+rk+G4PBOTPwpkmP6pRgq3mUi0eHVM1jlVv2G4g32o7NuyRf+h16Zs+iCKysBCUcISvzfVUtUDGDjpFQYRPcywUZZKC9oe2faC3xRVrlI8OYIBpF9g2xEh3O96BMbMr7RHsOq2xdKrNtQ2rNHzwZUNPcVei3x3JjOn9iDB4oe2K3vrmzYkV3mwci7yurt4yfmJQqupUEdPJPm/g/RunS78gKwRgJPSXzomVcCWUr5GgQu/ooLvPNaKkNudfu/6HmJtn265uqrLfFIvFHgYlYtLi99W1Wicvc8kQ6U/GA== Received: from SJ0PR05CA0160.namprd05.prod.outlook.com (2603:10b6:a03:339::15) by DM6PR12MB4201.namprd12.prod.outlook.com (2603:10b6:5:216::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.23; Thu, 26 Jun 2025 12:09:30 +0000 Received: from SJ5PEPF000001D2.namprd05.prod.outlook.com (2603:10b6:a03:339:cafe::de) by SJ0PR05CA0160.outlook.office365.com (2603:10b6:a03:339::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.7 via Frontend Transport; Thu, 26 Jun 2025 12:09:30 +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 SJ5PEPF000001D2.mail.protection.outlook.com (10.167.242.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:09:29 +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; Thu, 26 Jun 2025 05:09:17 -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.1544.14; Thu, 26 Jun 2025 05:09:15 -0700 From: Xueming Li To: Viacheslav Ovsiienko CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix hypervisor detection in VLAN workaround' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:42 +0800 Message-ID: <20250626120145.27369-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: SJ5PEPF000001D2:EE_|DM6PR12MB4201:EE_ X-MS-Office365-Filtering-Correlation-Id: edf1ee73-6803-40c3-a425-08ddb4aa4dd6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?aQ6Kn7WestfGl8zm0xNwvQnRHdoypKg1VVuZL94JA5H/bPGME2zvCmDVgnzx?= =?us-ascii?Q?IW5LRuSL+NHfjYhPngaDFTv1xUzuJ5xCDfmP13Xk2G9XObun4EwdtzQawrUb?= =?us-ascii?Q?P3CO/f6wOFWcl36b6eC+pjEzYwkDXPuvcIz32aGNWWwzyYpMXBLuXEmADia4?= =?us-ascii?Q?fWC13hKcn0ILjrBWK5gh9tgcI1Mqc5Z55v/U+ZnojB8r7yHxV3rsGIp9XhYm?= =?us-ascii?Q?KNetecZ99rBv0vNG3gGNYLkJ0y6cHzLyRUVmn8xzE9nRzu3Gcpn3OeEk6MOF?= =?us-ascii?Q?YNfi4Y1ervhRo+fXIf9RYwX0zQB9nY+WNH3FgSUdNRm/+hk8QW5P04aufAjN?= =?us-ascii?Q?VBMAUmXD6wmCwNdqUK5dkqAcUHVjHDZO1dTSyG5PzgnYkhedc7QwfIEK/B72?= =?us-ascii?Q?af+bzxSYy81rmSfO8wfLnJ+CXZGat+vOMGE5gLUfuAX/9EVDMQvsZol9psa7?= =?us-ascii?Q?idF35Gti/Pj67jFUGyVzss50ivJ1XSMk/SXGQYM0KMlDLkPWZGDSUWpwPzWn?= =?us-ascii?Q?Pkz2J3acJDLKYdjxsiQyCiLavoqkC9JuoG1qIJs8gqrOhZigpqaMSl+AYv47?= =?us-ascii?Q?8yR1FYvlJfMpJiGspJtJcRlVkc4XLZiqBdY2pKm3RKDUAgkQN4Eu805Wn2Jw?= =?us-ascii?Q?UWffS6xrNkjfOTKHZH7dJwmqJOZeRGkWOAzFRJdCkAnm03r7JQnh3ngEvNNb?= =?us-ascii?Q?NubjIL5vRS/5YQ6JWlSdy8otjZpS45KP22BDEJady1t6gzDn2AIWmh4dUp1z?= =?us-ascii?Q?2OXh+O9CZsEF9d+M+TAn8KlrD8Fw96/RTvu+l73mvD92rkpQQXYh/5yeHwI9?= =?us-ascii?Q?hHQOcWeWWzkqcJaJtStTyp1nueYSf1KQaDurvYWhX4juZwNCk4/Jt6d7PuwX?= =?us-ascii?Q?LRdD9/3ou1JOSe2EvBWumBeLL0+GybqZw3mda24MjkMK/6mEnlMcn6jKnhRQ?= =?us-ascii?Q?GedbB+6YmGkp8F6xxftF/ywBT4kj3QHo4KCC592p58ApMvUHMROpwCx0et7B?= =?us-ascii?Q?AkGo3rPsn/SZsGe2SOarLlRhZyy7d5cC5Du5h2oOPXTFIDrXYSOfRmO5wKmn?= =?us-ascii?Q?5S11mfRtrduCoxZ4+Mmrbonxah+K4Aem4giOX33L5l0bFJzMUujwTAHyVOBp?= =?us-ascii?Q?8Ka7IDLtU9WIzsClXhEFxQMHVQ5rlut6xW5O7ZOtnTro2/1f16mHW4DXoHBF?= =?us-ascii?Q?OF8Ejh7bEuFk5cgxLYSDS88ml5+taQxT5VIwdausaou17UWIwwpxtDzUkrMf?= =?us-ascii?Q?VwXmXD9W4HF89GuWZKT2ock3OB1o/nYWVc1oGMAtvtFbZ60oAntw5n6GAs4O?= =?us-ascii?Q?nf2tlhacx02QOdQ3URmL9HRivlS4qrrw1ILvCT2KH/dk0JsTh0uzZAfMUwON?= =?us-ascii?Q?4ZjQSd62Il00f2D86DSQuje5ZsfNG9qWenqEERwnhgQYaQjpz6s2PRYQmcae?= =?us-ascii?Q?TzHmjFwlesOi1dTtfRq07Yaa42la+HlxcKu/dQXeNNsuyYCrgH2Rud4xWCS9?= =?us-ascii?Q?MAct8NV5iYZLMe2EnFhLLgnN4AJubA084s/rfWVWrV7an6CKJb2a55ReJw?= =?us-ascii?Q?=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)(82310400026)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:09:29.9505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edf1ee73-6803-40c3-a425-08ddb4aa4dd6 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: SJ5PEPF000001D2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4201 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/28/25. 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=bd6d0822b1057ce25dd0e9f9cf9dfc90b4624fd7 Thanks. Xueming Li --- >From bd6d0822b1057ce25dd0e9f9cf9dfc90b4624fd7 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Fri, 6 Dec 2024 16:26:05 +0200 Subject: [PATCH] net/mlx5: fix hypervisor detection in VLAN workaround Cc: Xueming Li [ upstream commit 8518a4e55980b23dfc7d855aefbef0df02e450e0 ] The mlx5 PMD provides a specific workaround for the VMware ESXi hypervisor, enabling on-demand routing configuration to virtual machines. This workaround activates when the device type is a Virtual Function and either an ESXi hypervisor is detected or the hypervisor type is unknown. For non-x86 architectures the function rte_hypervisor_get() consistently returns an unknown type, which triggers the workaround automatically without any actual needs. If there are VLAN support requirements, this can lead to failures in inserting default control flows. Do not trigger the workaround for unknown hypervisor type in non-x86 environments. Fixes: dfedf3e3f9d2 ("net/mlx5: add workaround for VLAN in virtual machine") Signed-off-by: Viacheslav Ovsiienko Acked-by: Bing Zhao --- drivers/net/mlx5/linux/mlx5_vlan_os.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_vlan_os.c b/drivers/net/mlx5/linux/mlx5_vlan_os.c index 81611a8d3f..353484de3f 100644 --- a/drivers/net/mlx5/linux/mlx5_vlan_os.c +++ b/drivers/net/mlx5/linux/mlx5_vlan_os.c @@ -112,16 +112,16 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex) /* Check whether there is desired virtual environment */ hv_type = rte_hypervisor_get(); switch (hv_type) { +#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_X86_64) + /* Always misdetected on ARM archs, let's ignore this */ case RTE_HYPERVISOR_UNKNOWN: +#endif case RTE_HYPERVISOR_VMWARE: - /* - * The "white list" of configurations - * to engage the workaround. - */ + /* The list of configurations to engage the workaround. */ break; default: /* - * The configuration is not found in the "white list". + * The configuration is not found in the list. * We should not engage the VLAN workaround. */ return NULL; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.782646602 +0800 +++ 0082-net-mlx5-fix-hypervisor-detection-in-VLAN-workaround.patch 2025-06-26 19:59:17.522418038 +0800 @@ -1 +1 @@ -From 8518a4e55980b23dfc7d855aefbef0df02e450e0 Mon Sep 17 00:00:00 2001 +From bd6d0822b1057ce25dd0e9f9cf9dfc90b4624fd7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8518a4e55980b23dfc7d855aefbef0df02e450e0 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org