summaryrefslogtreecommitdiffstats
path: root/drivers/pci/slot.c
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2015-07-17 17:16:32 +0800
committerBjorn Helgaas <bhelgaas@google.com>2015-07-30 16:19:53 -0500
commit017ffe64e8b8c8db0f50433a71da41c6a4e12710 (patch)
treee15b309ad6ebf5322bb3c2a54ba244750dd57c0b /drivers/pci/slot.c
parent67546762978f523749eac157903e0b01c18e083a (diff)
downloadblackbird-op-linux-017ffe64e8b8c8db0f50433a71da41c6a4e12710.tar.gz
blackbird-op-linux-017ffe64e8b8c8db0f50433a71da41c6a4e12710.zip
PCI: Hold pci_slot_mutex while searching bus->slots list
Previously, pci_setup_device() and similar functions searched the pci_bus->slots list without any locking. It was possible for another thread to update the list while we searched it. Add pci_dev_assign_slot() to search the list while holding pci_slot_mutex. [bhelgaas: changelog, fold in CONFIG_SYSFS fix] Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/slot.c')
-rw-r--r--drivers/pci/slot.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index 4bd3fce93fa4..429d34c348b9 100644
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -194,6 +194,17 @@ static int rename_slot(struct pci_slot *slot, const char *name)
return result;
}
+void pci_dev_assign_slot(struct pci_dev *dev)
+{
+ struct pci_slot *slot;
+
+ mutex_lock(&pci_slot_mutex);
+ list_for_each_entry(slot, &dev->bus->slots, list)
+ if (PCI_SLOT(dev->devfn) == slot->number)
+ dev->slot = slot;
+ mutex_unlock(&pci_slot_mutex);
+}
+
static struct pci_slot *get_slot(struct pci_bus *parent, int slot_nr)
{
struct pci_slot *slot;
OpenPOWER on IntegriCloud