From d31a89719024934cb834ca4ed7f76e8d178cd366 Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Mon, 10 May 2021 16:13:42 +0300 Subject: [PATCH] net/mlx5: fix LAG representor probing on PF1 PCI In case of bonding, orchestrator wants to use same devargs for LAG and non-LAG scenario to probe representor on PF1 using PF1 PCI address like ",representor=pf1vf[0-3]". This patch changes PCI address check policy to allow PF1 PCI address for representors on PF1. Note: detaching PF0 device can't remove representors on PF1. It's recommended to use primary(PF0) PCI address to probe representors on both PFs. Fixes: f926cce3fa94 ("net/mlx5: refactor bonding representor probing") Cc: stable@dpdk.org Signed-off-by: Xueming Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 41b3e076a1..ef7ccba5de 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1879,11 +1879,14 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev, tmp_str); break; } - /* Match PCI address. */ + /* Match PCI address, allows BDF0+pfx or BDFx+pfx. */ if (pci_dev->domain == pci_addr.domain && pci_dev->bus == pci_addr.bus && pci_dev->devid == pci_addr.devid && - pci_dev->function + owner == pci_addr.function) + ((pci_dev->function == 0 && + pci_dev->function + owner == pci_addr.function) || + (pci_dev->function == owner && + pci_addr.function == owner))) pf = info.port_name; /* Get ifindex. */ snprintf(tmp_str, sizeof(tmp_str), -- 2.20.1