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 93A6F468E4 for ; Thu, 12 Jun 2025 23:11:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FC4242E0C; Thu, 12 Jun 2025 23:11:28 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 8879642E5F for ; Thu, 12 Jun 2025 23:11:25 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4508287895dso16589615e9.1 for ; Thu, 12 Jun 2025 14:11:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762685; x=1750367485; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pHFEOerX5bD4YcpU33F6550UkcLHRmk9gUisI8Xa+Q=; b=DLdd4notgzwFsnCmTEjP+c86QNAHVPPLTpuueYyCdQnUwEPjvqzAGrLfYRygZFX6Hp Z7hHoEG+e9EYrMaFbFBA9BK0JopNQftOq9EZTN1dGKFT15xFcBO6AcGG5OuhGo9A/GIg SjPZvDvgDdWpr5C7t1tWS3S6iPqHKMGyR/06et8xFfd5jNMMBGS/Bitimcf1A1FFBv2b Sa/lJKLRBT5JGnEYky54A9OXCEO5NeVHhU4Gtgzr6S07lFqZb/cTe8hfNbcdIss4EFd2 eNgny/iz5A/bHpfyZd+74EE26IdDJfhAJIN1BdPs91xebEzrSuZ/ABQYceHJdokJWDlm 5Emw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762685; x=1750367485; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pHFEOerX5bD4YcpU33F6550UkcLHRmk9gUisI8Xa+Q=; b=whpIbDl+zFqOxKxJLpskxPeFyNqjwoays2Vc1KMiADOzpKjcioNGTYJh33LNBrhUUI vADLZCWz1SHZ+VjBXilYNRkS6ok0QUrZN9bm6cohKYMD/1NACy/7pPcMyXWJBgOeB/9o Ut8egp7/z/HiC6TqW3uy0Phb1Inv1I66KQicAHNT3M21LSYbtvM0nwUotpur7U8uWLZl pUGRCn0yGW6dCfqvnr1cCVrf8+4lHyerQ3FNFhWmN7MSk/z8PAlMro1voMUmzhiflum7 pgTd5v1yPck/fp9QbC+PptSytfWM6lG/NS9MtLvxQI89AMoGt0xzo0X3FvGrcHaudP1A bDBQ== X-Forwarded-Encrypted: i=1; AJvYcCUOwxbTLMPDXUHEKQBkk+KFCR3LaMv4w9mdgPSWJaJYK5kbjd4k4Ki5Ec/phNg0iL5Q0scsSkc=@dpdk.org X-Gm-Message-State: AOJu0YyTLdSDh0A2chVXQHL1xZuBOK6SKXyllzfcCxjSaQpwwlhxo/H/ mAGEV+FJ+8G1B+9hmJ9u3g+GD9uobrNXc1BtOFDn0E7yO43AfIRqe0IPuIecqpdYYd0= X-Gm-Gg: ASbGncvlIU3Mc3N6qIQ+xUUSUsOu+bmQTQ7BUIlqEjO9DVyaY2GpS7eUMWca23RD6Yo 4qZ+51LdlnYfpJIZGoYyL7x0RhGMGzkDBCa9BRhIOsLEdoHC6npzzby2v1Myxgp3aSSg8CCeAlG QuoOzP4c3wPQDJ+4HmgSI77Ro6Kp53DRJqKsEUMA7dTcTNqRvCzudIlhGsqFlhW5jBBpyObDkSO h9JusdgHOQbeW/sJt68cOVq+UJwadOt1p9+arpqE9IPvcWFy9/ryQ12/Cyf5g3PalzRqULKx1o9 8lXCxuOVXJo3t8vwY27nt+z337Kun2+3oOxqsoXXHFZPElInuN6lFMCvDP9WLsW/vGqJ X-Google-Smtp-Source: AGHT+IF6VIWNmHge90nJEF4yrr7Xt9Q2H3yzQ2x5twEOXxh17e1+5sCEUACV2JRntTnq1ZqYVqXLrQ== X-Received: by 2002:a05:6000:2b0a:b0:3a4:f73e:abb1 with SMTP id ffacd0b85a97d-3a56a2bf86amr38484f8f.4.1749762684987; Thu, 12 Jun 2025 14:11:24 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b7741bsm366672f8f.98.2025.06.12.14.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:11:24 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix hypervisor detection in VLAN workaround' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:26 +0100 Message-ID: <20250612210733.2506558-69-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/001b42efadfcb1967be621fb26ca622c264f3351 Thanks. Luca Boccassi --- >From 001b42efadfcb1967be621fb26ca622c264f3351 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 @@ -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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:26.351564859 +0100 +++ 0069-net-mlx5-fix-hypervisor-detection-in-VLAN-workaround.patch 2025-06-12 22:06:23.894045145 +0100 @@ -1 +1 @@ -From 8518a4e55980b23dfc7d855aefbef0df02e450e0 Mon Sep 17 00:00:00 2001 +From 001b42efadfcb1967be621fb26ca622c264f3351 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8518a4e55980b23dfc7d855aefbef0df02e450e0 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org