Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1342338

[PATCH] PCI: Remove usage of pci_domain_nr when the PCI bus doesn't yet exist

Show all headers | View raw

From: Jake Oshins <jakeo@microsoft.com>

This patch fixes a race condition in this driver.  Using the
function pci_domain_nr() only works if the PCI bus has already
been fully created.  This patch just deletes one call site,
as it was in debug prints which aren't strictly necessary.
Another call site is changed to look for the data in the same
structure that is passed in when creating the PCI bus in the
first place.

Signed-off-by: Jake Oshins <jakeo@microsoft.com>
---
 drivers/pci/host/pci-hyperv.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index 9391dee..ed651ba 100644
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -1265,11 +1265,6 @@ static struct hv_pci_dev *new_pcichild_device(struct hv_pcibus_device *hbus,
 	if (!hpdev)
 		return NULL;
 
-	dev_info(&hbus->hdev->device,
-		 "New child device (%p) [%04x:%04x] at %04x:00:00.%02x\n",
-		 hpdev, desc->v_id, desc->d_id, pci_domain_nr(hbus->pci_bus),
-		 desc->win_slot.bits.func);
-
 	hpdev->hbus = hbus;
 
 	memset(&pkt, 0, sizeof(pkt));
@@ -1558,9 +1553,15 @@ static void hv_eject_device_work(struct work_struct *work)
 		return;
 	}
 
+	/*
+	 * Ejection can come before or after the PCI bus has been set up, so
+	 * attempt to find it and tear down the bus state, if it exists.  This
+	 * must be done without constructs like pci_domain_nr(hbus->pci_bus)
+	 * because hbus->pci_bus may not exist yet.
+	 */
 	wslot = wslot_to_devfn(hpdev->desc.win_slot.slot);
-	pdev = pci_get_domain_bus_and_slot(pci_domain_nr(hpdev->hbus->pci_bus),
-					   0, wslot);
+	pdev = pci_get_domain_bus_and_slot(hpdev->hbus->sysdata.domain, 0,
+					   wslot);
 	if (pdev) {
 		pci_stop_and_remove_bus_device(pdev);
 		pci_dev_put(pdev);
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] PCI: Remove usage of pci_domain_nr when the PCI bus doesn't yet exist jakeo@microsoft.com - 2016-02-24 20:00 +0100
  Re: [PATCH] PCI: Remove usage of pci_domain_nr when the PCI bus  doesn't yet exist Bjorn Helgaas <helgaas@kernel.org> - 2016-02-25 16:20 +0100

csiph-web