pci: propagate exact error codes in pci_probe_all_drivers()

Message ID 20181026075459.21637-1-dariusz.stojaczyk@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series pci: propagate exact error codes in pci_probe_all_drivers() |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Stojaczyk, Dariusz Oct. 26, 2018, 7:54 a.m. UTC
  In a couple of places we check its error code against -EEXIST,
but this function returned either -1, 0, or 1.

This gets critical when hotplugging a device in secondary
process, while the same device is already plugged in the
primary. Failing to "hotplug" it in the primary will cause
the secondary to fail as well.

Fixes: e9d159c3d534 ("eal: allow probing a device again")
Cc: thomas@monjalon.net
Cc: stable@dpdk.org

Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 drivers/bus/pci/pci_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Thomas Monjalon Oct. 29, 2018, 12:57 a.m. UTC | #1
26/10/2018 09:54, Darek Stojaczyk:
> In a couple of places we check its error code against -EEXIST,
> but this function returned either -1, 0, or 1.
> 
> This gets critical when hotplugging a device in secondary
> process, while the same device is already plugged in the
> primary. Failing to "hotplug" it in the primary will cause
> the secondary to fail as well.
> 
> Fixes: e9d159c3d534 ("eal: allow probing a device again")
> Cc: thomas@monjalon.net
> Cc: stable@dpdk.org

No need of Cc: stable here.

> Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>

Acked-by: Thomas Monjalon <thomas@monjalon.net>

Applied, thanks
  

Patch

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index feb79803c..6276e5d69 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -243,7 +243,7 @@  rte_pci_detach_dev(struct rte_pci_device *dev)
 
 /*
  * If vendor/device ID match, call the probe() function of all
- * registered driver for the given device. Return -1 if initialization
+ * registered driver for the given device. Return < 0 if initialization
  * failed, return 1 if no driver is found for this device.
  */
 static int
@@ -253,13 +253,13 @@  pci_probe_all_drivers(struct rte_pci_device *dev)
 	int rc = 0;
 
 	if (dev == NULL)
-		return -1;
+		return -EINVAL;
 
 	FOREACH_DRIVER_ON_PCIBUS(dr) {
 		rc = rte_pci_probe_one_driver(dr, dev);
 		if (rc < 0)
 			/* negative value is an error */
-			return -1;
+			return rc;
 		if (rc > 0)
 			/* positive value means driver doesn't support it */
 			continue;