summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Hayes <stuart.w.hayes@gmail.com>2017-10-04 10:57:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-25 14:23:44 +0100
commit164a941c031bc32e990abaa042367047d6d97975 (patch)
tree3fc176eb8a19fa656b42c30dedfb90d8d62ed652
parentb40eeea31afd1c07f37734fa19ef1c45f5e98011 (diff)
downloadlinux-stable-164a941c031bc32e990abaa042367047d6d97975.tar.gz
linux-stable-164a941c031bc32e990abaa042367047d6d97975.tar.bz2
linux-stable-164a941c031bc32e990abaa042367047d6d97975.zip
PCI: Create SR-IOV virtfn/physfn links before attaching driver
[ Upstream commit 27d6162944b9b34c32cd5841acd21786637ee743 ] When creating virtual functions, create the "virtfn%u" and "physfn" links in sysfs *before* attaching the driver instead of after. When we attach the driver to the new virtual network interface first, there is a race when the driver attaches to the new sends out an "add" udev event, and the network interface naming software (biosdevname or systemd, for example) tries to look at these links. Signed-off-by: Stuart Hayes <stuart.w.hayes@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pci/iov.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 47227820406d..1d32fe2d97aa 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -164,7 +164,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)
pci_device_add(virtfn, virtfn->bus);
mutex_unlock(&iov->dev->sriov->lock);
- pci_bus_add_device(virtfn);
sprintf(buf, "virtfn%u", id);
rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf);
if (rc)
@@ -175,6 +174,8 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset)
kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE);
+ pci_bus_add_device(virtfn);
+
return 0;
failed2: