Skip to content

Commit

Permalink
xen/pcifront: Use global PCI rescan-remove locking
Browse files Browse the repository at this point in the history
Multiple race conditions are possible between the Xen pcifront device
addition and removal and the generic PCI device addition and removal that
can be triggered via sysfs.

To avoid those race conditions make the Xen pcifront code use global PCI
rescan-remove locking.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Rafael J. Wysocki authored and Bjorn Helgaas committed Jan 15, 2014
1 parent 1c2042c commit a83919e
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/pci/xen-pcifront.c
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,15 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
}
pcifront_init_sd(sd, domain, bus, pdev);

pci_lock_rescan_remove();

b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
&pcifront_bus_ops, sd);
if (!b) {
dev_err(&pdev->xdev->dev,
"Error creating PCI Frontend Bus!\n");
err = -ENOMEM;
pci_unlock_rescan_remove();
goto err_out;
}

Expand All @@ -494,6 +497,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
/* Create SysFS and notify udev of the devices. Aka: "going live" */
pci_bus_add_devices(b);

pci_unlock_rescan_remove();
return err;

err_out:
Expand Down Expand Up @@ -556,6 +560,7 @@ static void pcifront_free_roots(struct pcifront_device *pdev)

dev_dbg(&pdev->xdev->dev, "cleaning up root buses\n");

pci_lock_rescan_remove();
list_for_each_entry_safe(bus_entry, t, &pdev->root_buses, list) {
list_del(&bus_entry->list);

Expand All @@ -568,6 +573,7 @@ static void pcifront_free_roots(struct pcifront_device *pdev)

kfree(bus_entry);
}
pci_unlock_rescan_remove();
}

static pci_ers_result_t pcifront_common_process(int cmd,
Expand Down Expand Up @@ -1043,8 +1049,10 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
domain, bus, slot, func);
continue;
}
pci_lock_rescan_remove();
pci_stop_and_remove_bus_device(pci_dev);
pci_dev_put(pci_dev);
pci_unlock_rescan_remove();

dev_dbg(&pdev->xdev->dev,
"PCI device %04x:%02x:%02x.%d removed.\n",
Expand Down

0 comments on commit a83919e

Please sign in to comment.