From 06bcaf50cab274395443fb8687263541486a5af9 Mon Sep 17 00:00:00 2001 From: Julien Courtat Date: Mon, 3 Jun 2013 00:00:00 +0000 Subject: [PATCH] pci: fix probing blacklisted device with RTE_PCI_DRV_MULTIPLE flag When blacklisting network adapters that share a PCI bus address with multiple ports such as Mellanox ConnectX-3 (librte_pmd_mlx4), RTE applications enter infinite loops while probing PCI devices. This commit removes this probe on subsequent instances for blacklisted devices that have RTE_PCI_DRV_MULTIPLE set. Signed-off-by: Julien Courtat Acked-by: Adrien Mazarguil --- lib/librte_eal/common/eal_common_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 2f11588d43..bf2a4143ac 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -121,7 +121,8 @@ pci_probe_all_drivers(struct rte_pci_device *dev) if (rte_eal_pci_probe_one_driver(dr, dev)) continue; /* initialize subsequent driver instances for this device */ - if (dr->drv_flags & RTE_PCI_DRV_MULTIPLE) + if ((dr->drv_flags & RTE_PCI_DRV_MULTIPLE) && + (!dev->blacklisted)) while (rte_eal_pci_probe_one_driver(dr, dev) == 0) ; return 0; -- 2.20.1