Skip to content

Commit f24c9bf

Browse files
Jiwei Sunbjorn-helgaas
authored andcommitted
PCI: vmd: Create domain symlink before pci_bus_add_devices()
The vmd driver creates a "domain" symlink in sysfs for each VMD bridge. Previously this symlink was created after pci_bus_add_devices() added devices below the VMD bridge and emitted udev events to announce them to userspace. This led to a race between userspace consumers of the udev events and the kernel creation of the symlink. One such consumer is mdadm, which assembles block devices into a RAID array, and for devices below a VMD bridge, mdadm depends on the "domain" symlink. If mdadm loses the race, it may be unable to assemble a RAID array, which may cause a boot failure or other issues, with complaints like this: (udev-worker)[2149]: nvme1n1: '/sbin/mdadm -I /dev/nvme1n1'(err) 'mdadm: Unable to get real path for '/sys/bus/pci/drivers/vmd/0000:c7:00.5/domain/device'' (udev-worker)[2149]: nvme1n1: '/sbin/mdadm -I /dev/nvme1n1'(err) 'mdadm: /dev/nvme1n1 is not attached to Intel(R) RAID controller.' (udev-worker)[2149]: nvme1n1: '/sbin/mdadm -I /dev/nvme1n1'(err) 'mdadm: No OROM/EFI properties for /dev/nvme1n1' (udev-worker)[2149]: nvme1n1: '/sbin/mdadm -I /dev/nvme1n1'(err) 'mdadm: no RAID superblock on /dev/nvme1n1.' (udev-worker)[2149]: nvme1n1: Process '/sbin/mdadm -I /dev/nvme1n1' failed with exit code 1. This symptom prevents the OS from booting successfully. After a NVMe disk is probed/added by the nvme driver, udevd invokes mdadm to detect if there is a mdraid associated with this NVMe disk, and mdadm determines if a NVMe device is connected to a particular VMD domain by checking the "domain" symlink. For example: Thread A Thread B Thread mdadm vmd_enable_domain pci_bus_add_devices __driver_probe_device ... work_on_cpu schedule_work_on : wakeup Thread B nvme_probe : wakeup scan_work to scan nvme disk and add nvme disk then wakeup udevd : udevd executes mdadm command flush_work main : wait for nvme_probe done ... __driver_probe_device find_driver_devices : probe next nvme device : 1) Detect domain symlink ... 2) Find domain symlink ... from vmd sysfs ... 3) Domain symlink not ... created yet; failed sysfs_create_link : create domain symlink Create the VMD "domain" symlink before invoking pci_bus_add_devices() to avoid this race. Suggested-by: Adrian Huang <[email protected]> Link: https://lore.kernel.org/linux-pci/[email protected] Signed-off-by: Jiwei Sun <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> [bhelgaas: commit log] Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Nirmal Patel <[email protected]>
1 parent 1613e60 commit f24c9bf

File tree

1 file changed

+4
-4
lines changed
  • drivers/pci/controller

1 file changed

+4
-4
lines changed

drivers/pci/controller/vmd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,9 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
925925
dev_set_msi_domain(&vmd->bus->dev,
926926
dev_get_msi_domain(&vmd->dev->dev));
927927

928+
WARN(sysfs_create_link(&vmd->dev->dev.kobj, &vmd->bus->dev.kobj,
929+
"domain"), "Can't create symlink to domain\n");
930+
928931
vmd_acpi_begin();
929932

930933
pci_scan_child_bus(vmd->bus);
@@ -964,9 +967,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
964967
pci_bus_add_devices(vmd->bus);
965968

966969
vmd_acpi_end();
967-
968-
WARN(sysfs_create_link(&vmd->dev->dev.kobj, &vmd->bus->dev.kobj,
969-
"domain"), "Can't create symlink to domain\n");
970970
return 0;
971971
}
972972

@@ -1042,8 +1042,8 @@ static void vmd_remove(struct pci_dev *dev)
10421042
{
10431043
struct vmd_dev *vmd = pci_get_drvdata(dev);
10441044

1045-
sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
10461045
pci_stop_root_bus(vmd->bus);
1046+
sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
10471047
pci_remove_root_bus(vmd->bus);
10481048
vmd_cleanup_srcu(vmd);
10491049
vmd_detach_resources(vmd);

0 commit comments

Comments
 (0)