Skip to contentSkip to conversation

fix a segfault when call callback

PATCH In review Min Hu (Connor) 2 participants 4 messages May 21, 2022 – Jun 7, 2022

lore
Share & tools
lore
#0 lore raw

cover fix a segfault when call callback

This patch set fix a segfault when call callback for pci and vdev.

Huisong Li (2):
bus/pci: fix a segfault when call callback
bus/vdev: fix a segfault when call callback

 drivers/bus/pci/pci_common.c | 13 +++++++++++--
 drivers/bus/vdev/vdev.c      | 11 +++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)
Signature · 1 line
2.33.0
#1 lore raw

PATCH 1/2 bus/pci: fix a segfault when call callback

From: Huisong Li <[email protected]>

After the driver probe is executed, the callback in application will be called. The callback in application may call some APIs which access the rte_pci_driver::driver by the device::driver pointer to get driver information. If the rte_pci_device::device::driver pointer isn't pointed to rte_pci_driver::driver in rte_pci_probe_one_driver, a segfault will occur. For example, when ethdev driver probe completes, the callback in application call rte_eth_dev_info_get which use dev->device->driver->name. So rte_pci_device::device::driver should point to rte_pci_driver::driver before executing the driver probe.

Fixes c752998b5e2e ("pci: introduce library and driver")
---
 drivers/bus/pci/pci_common.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/bus/pci/pci_common.c +11 -2
index 4a3a87f24f..507a654779 100644
@@ -265,11 +265,22 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 			dr->driver.name, dev->id.vendor_id, dev->id.device_id,
 			loc->domain, loc->bus, loc->devid, loc->function,
 			dev->device.numa_node);
+
+	/*
+	 * After the driver probe is executed, the callback in application will
+	 * be called. The callback in application may call some APIs which use
+	 * dev->device.driver to get some driver information. If the driver
+	 * pointer isn't pointed to driver->driver here, a segfault will occur.
+	 */
+	if (!already_probed)
+		dev->device.driver = &dr->driver;
+
 	/* call the driver probe() function */
 	ret = dr->probe(dr, dev);
 	if (already_probed)
 		return ret; /* no rollback if already succeeded earlier */
 	if (ret) {
+		dev->device.driver = NULL;
 		dev->driver = NULL;
 		if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
 			/* Don't unmap if device is unsupported and
@@ -282,8 +293,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 		dev->vfio_req_intr_handle = NULL;
 		rte_intr_instance_free(dev->intr_handle);
 		dev->intr_handle = NULL;
-	} else {
-		dev->device.driver = &dr->driver;
 	}
 
 	return ret;
Signature · 1 line
2.33.0
#2 lore raw

Re: [PATCH 1/2] bus/pci: fix a segfault when call callback

21/05/2022 09:05, Min Hu (Connor):

Quoted 4 lines

From: Huisong Li <[email protected]>

After the driver probe is executed, the callback in application will be called. The callback in application may call some APIs which access the

What is the "callback in application" ?
Do you mean the callback on probing event like RTE_ETH_EVENT_NEW?

Quoted 7 lines

rte_pci_driver::driver by the device::driver pointer to get driver information. If the rte_pci_device::device::driver pointer isn't pointed to rte_pci_driver::driver in rte_pci_probe_one_driver, a segfault will occur. For example, when ethdev driver probe completes, the callback in application call rte_eth_dev_info_get which use dev->device->driver->name. So rte_pci_device::device::driver should point to rte_pci_driver::driver before executing the driver probe.

I understand the need and I approve the move.

Quoted 14 lines
Fixes c752998b5e2e ("pci: introduce library and driver")
---
 drivers/bus/pci/pci_common.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/bus/pci/pci_common.c +0 -0
index 4a3a87f24f..507a654779 100644

drivers/bus/pci/pci_common.c rte_pci_probe_one_driver(struct rte_pci_driver *dr, · line 274

Quoted 10 lines
drivers/bus/pci/pci_common.c +7 -0
@@ -265,11 +265,22 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 			dr->driver.name, dev->id.vendor_id, dev->id.device_id,
 			loc->domain, loc->bus, loc->devid, loc->function,
 			dev->device.numa_node);
+
+	/*
+	 * After the driver probe is executed, the callback in application will
+	 * be called. The callback in application may call some APIs which use
+	 * dev->device.driver to get some driver information. If the driver
+	 * pointer isn't pointed to driver->driver here, a segfault will occur.
+	 */

I would like to make this comment simpler
once I'm sure we share the same understanding.

Quoted 22 lines
drivers/bus/pci/pci_common.c +4 -2
+	if (!already_probed)
+		dev->device.driver = &dr->driver;
+
 	/* call the driver probe() function */
 	ret = dr->probe(dr, dev);
 	if (already_probed)
 		return ret; /* no rollback if already succeeded earlier */
 	if (ret) {
+		dev->device.driver = NULL;
 		dev->driver = NULL;
 		if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
 			/* Don't unmap if device is unsupported and
@@ -282,8 +293,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 		dev->vfio_req_intr_handle = NULL;
 		rte_intr_instance_free(dev->intr_handle);
 		dev->intr_handle = NULL;
-	} else {
-		dev->device.driver = &dr->driver;
 	}
 
 	return ret;
#3 lore raw

PATCH 2/2 bus/vdev: fix a segfault when call callback

In reply to Min Hu (Connor)

From: Huisong Li <[email protected]>

After the driver probe is executed, the callback in application will be called. And this callback may call some APIs which access the driver in struct rte_vdev_driver by the device::driver pointer to get some driver information. If the rte_vdev_device::device::driver pointer isn't pointed to the rte_vdev_driver::driver before executing driver probe, a segfault will occur.

Fixes e9d159c3d534 ("eal: allow probing a device again")
---
 drivers/bus/vdev/vdev.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/bus/vdev/vdev.c +9 -2
index a8d8b2327e..dea3937607 100644
@@ -209,9 +209,16 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
 		return -1;
 	}
 
+	/*
+	 * After the driver probe is executed, the callback in application will
+	 * be called. The callback in application may call some APIs which use
+	 * dev->device.driver to get some driver information. If the driver
+	 * pointer isn't pointed to driver->driver here, a segfault will occur.
+	 */
+	dev->device.driver = &driver->driver;
 	ret = driver->probe(dev);
-	if (ret == 0)
-		dev->device.driver = &driver->driver;
+	if (ret != 0)
+		dev->device.driver = NULL;
 	return ret;
 }
 
Signature · 1 line
2.33.0