[I/J/Unstable][SRU][PATCH 1/1] net/mlx5e: Unblock setting vid 0 for VF in case PF isn't eswitch manager

Po-Hsu Lin po-hsu.lin at canonical.com
Tue Jan 25 08:54:25 UTC 2022


From: Maor Dickman <maord at nvidia.com>

BugLink: https://bugs.launchpad.net/bugs/1957753

When using libvirt to passthrough VF to VM it will always set the VF vlan
to 0 even if user didn’t request it, this will cause libvirt to fail to
boot in case the PF isn't eswitch owner.

Example of such case is the DPU host PF which isn't eswitch manager, so
any attempt to passthrough VF of it using libvirt will fail.

Fix it by not returning error in case set VF vlan is called with vid 0.

Signed-off-by: Maor Dickman <maord at nvidia.com>
Reviewed-by: Roi Dayan <roid at nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm at nvidia.com>
(cherry picked from commit 7846665d3504812acaebf920d1141851379a7f37)
Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
index d9041b1..de68b32 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
@@ -430,7 +430,7 @@ int mlx5_eswitch_set_vport_vlan(struct mlx5_eswitch *esw,
 	int err = 0;
 
 	if (!mlx5_esw_allowed(esw))
-		return -EPERM;
+		return vlan ? -EPERM : 0;
 
 	if (vlan || qos)
 		set_flags = SET_VLAN_STRIP | SET_VLAN_INSERT;
-- 
2.7.4




More information about the kernel-team mailing list