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 40BAB46BAE for ; Fri, 18 Jul 2025 21:36:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B65140611; Fri, 18 Jul 2025 21:36:23 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7E15940611 for ; Fri, 18 Jul 2025 21:36:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cJysAB3MasvpNb2Kv1uojE5zC3trvhZ/7s05PUBRqx0=; b=Ke+WOY+pmSsLbJWxpNXg41GyNxgyzlYQJFU4dRuoTXEt9hRnXpqzWUk+c0XBta0aYsI9Fl eLxrGRVTH9/Kbo7IkD+iJUG3IHbBhhDe3SynCUUHyyU0zBAcvwtggEQTtaEWgH7sOuGPAP umROfonHKzQDfkGX1PjEgcTDx3BQ24Y= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-102-LQIArOV9Pim7YTqUD7dzig-1; Fri, 18 Jul 2025 15:36:18 -0400 X-MC-Unique: LQIArOV9Pim7YTqUD7dzig-1 X-Mimecast-MFC-AGG-ID: LQIArOV9Pim7YTqUD7dzig_1752867377 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AFA1619560A2; Fri, 18 Jul 2025 19:36:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 594CD180049D; Fri, 18 Jul 2025 19:36:16 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix hypervisor detection in VLAN workaround' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:31 +0100 Message-ID: <20250718193247.1008129-97-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FnwcMVsZnFCWuH29XxtNhhKGJpyVXXZveU-eKk9WXe0_1752867377 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.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 07/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b872565b569019a80ddecdd2df96066d7d1de0f0 Thanks. Kevin --- >From b872565b569019a80ddecdd2df96066d7d1de0f0 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 [ 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 @@ -113,14 +113,14 @@ mlx5_vlan_vmwa_init(struct rte_eth_dev *dev, uint32_t ifindex) 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. */ -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.366144085 +0100 +++ 0097-net-mlx5-fix-hypervisor-detection-in-VLAN-workaround.patch 2025-07-18 20:29:11.003502450 +0100 @@ -1 +1 @@ -From 8518a4e55980b23dfc7d855aefbef0df02e450e0 Mon Sep 17 00:00:00 2001 +From b872565b569019a80ddecdd2df96066d7d1de0f0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8518a4e55980b23dfc7d855aefbef0df02e450e0 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org