From 255c05b72455dcad1b5552d12a813b31f68201a7 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Fri, 20 Apr 2018 22:38:30 +0200 Subject: [PATCH 01/22] test/udev-test.pl: allow multiple devices per test Allow testing cases where multiple devices are added and removed. This implies a change of the data structure: every test allows for multiple devices to be added, and "exp_name" etc. are now properties of the device, not of the test. --- test/udev-test.pl | 1358 +++++++++++++++++++++++++++++++-------------- 1 file changed, 932 insertions(+), 426 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 1ab6828d71..cf7c7e0bcd 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -48,17 +48,28 @@ $rules_10k_tags_continuation .= "TAG+=\"test10000\"\\n"; my @tests = ( { desc => "no rules", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "sda" , + exp_rem_error => "yes", + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "sda1" , + exp_rem_error => "yes", + }], rules => < "label test of scsi disc", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "boot_disk" , + }], rules => < "label test of scsi disc", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "boot_disk" , + }], rules => < "label test of scsi disc", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "boot_disk" , + }], rules => < "label test of scsi partition", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "boot_disk1" , + }], rules => < "label test of pattern match", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "boot_disk1" , + }], rules => < "label test of multiple sysfs files", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "boot_disk1" , + }], rules => < "label test of max sysfs files (skip invalid rule)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "boot_disk1" , + }], rules => < "catch device by *", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem/0" , + }], rules => < "catch device by * - take 2", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem/0" , + }], rules => < "catch device by ?", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem/0" , + }], rules => < "catch device by character class", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem/0" , + }], rules => < "replace kernel name", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "Handle comment lines in config file (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "Handle comment lines in config file with whitespace (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "Handle whitespace only lines (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "whitespace", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "whitespace" , + }], rules => < "Handle empty lines in config file (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "Handle backslashed multi lines in config file (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "preserve backslashes, if they are not for a newline", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "aaa", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "aaa", + }], rules => < "Handle stupid backslashed multi lines in config file (and replace kernel name)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "subdirectory handling", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "sub/direct/ory/modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "sub/direct/ory/modem" , + }], rules => < "parent device name match of scsi partition", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "first_disk5", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "first_disk5" , + }], rules => < "test substitution chars", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" , + }], rules => < "import of shell-value returned from program", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node12345678", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node12345678", + }], rules => < "substitution of sysfs value (%s{file})", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "disk-ATA-sda", + desc => "sustitution of sysfs value (%s{file})", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "disk-ATA-sda" , + }], rules => < "program result substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "special-device-5", - not_exp_name => "not", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "special-device-5" , + not_exp_name => "not" , + }], rules => < "program result substitution (newline removal)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "newline_removed", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "newline_removed" , + }], rules => < "program result substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "test-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "test-0:0:0:0" , + }], rules => < "program with lots of arguments", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo9", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "foo9" , + }], rules => < "program with subshell", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "bar9", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "bar9" , + }], rules => < "program arguments combined with apostrophes", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo7", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "foo7" , + }], rules => < "program arguments combined with escaped double quotes, part 1", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "foo2" , + }], rules => < "program arguments combined with escaped double quotes, part 2", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "foo2" , + }], rules => < "program arguments combined with escaped double quotes, part 3", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "foo2" , + }], rules => < "characters before the %c{N} substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "my-foo9", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "my-foo9" , + }], rules => < "substitute the second to last argument", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "my-foo8", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "my-foo8" , + }], rules => < "test substitution by variable name", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + }], rules => < "test substitution by variable name 2", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + }], rules => < "test substitution by variable name 3", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "850:0:0:05", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "850:0:0:05" , + }], rules => < "test substitution by variable name 4", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "855", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "855" , + }], rules => < "test substitution by variable name 5", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "8550:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "8550:0:0:0" , + }], rules => < "non matching SUBSYSTEMS for device with no parent", - devpath => "/devices/virtual/tty/console", - exp_name => "TTY", + devices => [ + { + devpath => "/devices/virtual/tty/console", + exp_name => "TTY", + }], rules => < "non matching SUBSYSTEMS", - devpath => "/devices/virtual/tty/console", - exp_name => "TTY", + devices => [ + { + devpath => "/devices/virtual/tty/console", + exp_name => "TTY" , + }], rules => < "ATTRS match", - devpath => "/devices/virtual/tty/console", - exp_name => "foo", + devices => [ + { + devpath => "/devices/virtual/tty/console", + exp_name => "foo" , + }], rules => < "ATTR (empty file)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "empty", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "empty" , + }], rules => < "ATTR (non-existent file)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "non-existent", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "non-existent" , + }], rules => < "program and bus type match", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "scsi-0:0:0:0" , + }], rules => < "sysfs parent hierarchy", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem" , + }], rules => < "name test with ! in the name", - devpath => "/devices/virtual/block/fake!blockdev0", - exp_name => "is/a/fake/blockdev0", + devices => [ + { + devpath => "/devices/virtual/block/fake!blockdev0", + exp_name => "is/a/fake/blockdev0" , + }], rules => < "name test with ! in the name, but no matching rule", - devpath => "/devices/virtual/block/fake!blockdev0", - exp_name => "fake/blockdev0", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/virtual/block/fake!blockdev0", + exp_name => "fake/blockdev0" , + exp_rem_error => "yes", + }], rules => < "KERNELS rule", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "scsi-0:0:0:0", + }], rules => < "KERNELS wildcard all", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "scsi-0:0:0:0", + }], rules => < "KERNELS wildcard partial", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "scsi-0:0:0:0", + }], rules => < "KERNELS wildcard partial 2", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", - rules => < [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "scsi-0:0:0:0", + }], + rules => < "substitute attr with link target value (first match)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "driver-is-sd", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "driver-is-sd", + }], rules => < "substitute attr with link target value (currently selected device)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "driver-is-ahci", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "driver-is-ahci", + }], rules => < "ignore ATTRS attribute whitespace", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ignored", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "ignored", + }], rules => < "do not ignore ATTRS attribute whitespace", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "matched-with-space", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "matched-with-space", + }], rules => < "permissions USER=bad GROUP=name", - devpath => "/devices/virtual/tty/tty33", - exp_name => "tty33", - exp_perms => "0:0:0600", + devices => [ + { + devpath => "/devices/virtual/tty/tty33", + exp_name => "tty33", + exp_perms => "0:0:0600", + }], rules => < "permissions OWNER=1", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => "1::0600", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => "1::0600", + }], rules => < "permissions GROUP=1", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => ":1:0660", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => ":1:0660", + }], rules => < "textual user id", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => "daemon::0600", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => "daemon::0600", + }], rules => < "textual group id", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => ":daemon:0660", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => ":daemon:0660", + }], rules => < "textual user/group id", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => "root:audio:0660", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => "root:audio:0660", + }], rules => < "permissions MODE=0777", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => "::0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => "::0777", + }], rules => < "permissions OWNER=1 GROUP=1 MODE=0777", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_perms => "1:1:0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_perms => "1:1:0777", + }], rules => < "permissions OWNER to 1", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "1::", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "1::", + }], rules => < "permissions GROUP to 1", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => ":1:0660", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => ":1:0660", + }], rules => < "permissions MODE to 0060", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "::0060", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "::0060", + }], rules => < "permissions OWNER, GROUP, MODE", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "1:1:0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "1:1:0777", + }], rules => < "permissions only rule", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "1:1:0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "1:1:0777", + }], rules => < "multiple permissions only rule", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "1:1:0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "1:1:0777", + }], rules => < "permissions only rule with override at SYMLINK+ rule", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", - exp_perms => "1:2:0777", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "ttyACM0", + exp_perms => "1:2:0777", + }], rules => < "major/minor number test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", - exp_majorminor => "8:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + exp_majorminor => "8:0", + }], rules => < "big major number test", - devpath => "/devices/virtual/misc/misc-fake1", - exp_name => "node", - exp_majorminor => "4095:1", - rules => < [ + { + devpath => "/devices/virtual/misc/misc-fake1", + exp_name => "node", + exp_majorminor => "4095:1", + }], + rules => < "big major and big minor number test", - devpath => "/devices/virtual/misc/misc-fake89999", - exp_name => "node", - exp_majorminor => "4095:89999", + devices => [ + { + devpath => "/devices/virtual/misc/misc-fake89999", + exp_name => "node", + exp_majorminor => "4095:89999", + }], rules => < "multiple symlinks with format char", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink2-ttyACM0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "symlink2-ttyACM0", + }], rules => < "multiple symlinks with a lot of s p a c e s", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "one", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "one", + not_exp_name => " ", + }], rules => < "symlink with spaces in substituted variable", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with leading space in substituted variable", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with trailing space in substituted variable", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with lots of space in substituted variable", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with multiple spaces in substituted variable", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with space and var with space, part 1", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "first", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "first", + not_exp_name => " ", + }], rules => < "symlink with space and var with space, part 2", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "name-one_two_three-end", + not_exp_name => " ", + }], rules => < "symlink with space and var with space, part 3", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "another_symlink", - not_exp_name => " ", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "another_symlink", + not_exp_name => " ", + }], rules => < "symlink creation (same directory)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "modem0", + }], rules => < "multiple symlinks", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "second-0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "second-0" , + }], rules => < "symlink name '.'", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => ".", - exp_add_error => "yes", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => ".", + exp_add_error => "yes", + exp_rem_error => "yes", + }], rules => < "symlink node to itself", - devpath => "/devices/virtual/tty/tty0", - exp_name => "link", - exp_add_error => "yes", - exp_rem_error => "yes", - option => "clean", + devices => [ + { + devpath => "/devices/virtual/tty/tty0", + exp_name => "link", + exp_add_error => "yes", + exp_rem_error => "yes", + }], + option => "clean", rules => < "symlink %n substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "symlink0", + }], rules => < "symlink %k substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink-ttyACM0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "symlink-ttyACM0", + }], rules => < "symlink %M:%m substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "major-166:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "major-166:0", + }], rules => < "symlink %b substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "symlink-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "symlink-0:0:0:0", + }], rules => < "symlink %c substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "test", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "test", + }], rules => < "symlink %c{N} substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "test", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "test", + }], rules => < "symlink %c{N+} substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "this", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "this", + }], rules => < "symlink only rule with %c{N+}", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "test", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "test", + }], rules => < "symlink %s{filename} substitution", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "166:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "166:0", + }], rules => < "program result substitution (numbered part of)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "link1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "link1", + }], rules => < "program result substitution (numbered part of+)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "link4", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_name => "link4", + }], rules => < "SUBSYSTEM match test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + }], rules => < "DRIVERS match test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + }], rules => < "devnode substitution test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node", + }], rules => < "parent node name substitution test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "sda-part-1", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "sda-part-1", + }], rules => < "udev_root substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "start-/dev-end", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "start-/dev-end", + }], rules => < "last_rule option", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "last", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "last", + }], rules => < "negation KERNEL!=", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "match", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "match", + }], rules => < "negation SUBSYSTEM!=", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "not-anything", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "not-anything", + }], rules => < "negation PROGRAM!= exit code", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "nonzero-program", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "nonzero-program", + }], rules => < "ENV{} test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "true", + }], rules => < "ENV{} test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "true", + }], rules => < "ENV{} test (assign)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "true", + }], rules => < "ENV{} test (assign 2 times)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "true", + }], rules => < "ENV{} test (assign2)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "part", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "part", + }], rules => < "untrusted string sanitize", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "sane", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "sane", + }], rules => < "untrusted string sanitize (don't replace utf8)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "uber", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "uber", + }], rules => < "untrusted string sanitize (replace invalid utf8)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "replaced", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "replaced", + }], rules => < "read sysfs value from parent device", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "serial-354172020305000", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "serial-354172020305000", + }], rules => < "match against empty key string", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "ok", + }], rules => < "check ACTION value", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "ok", + }], rules => < "final assignment", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", - exp_perms => "root:tty:0640", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "ok", + exp_perms => "root:tty:0640", + }], rules => < "final assignment 2", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", - exp_perms => "root:tty:0640", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "ok", + exp_perms => "root:tty:0640", + }], rules => < "env substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node-add-me", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "node-add-me", + }], rules => < "reset list to current value", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "three", - not_exp_name => "two", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "three", + not_exp_name => "two", + }], rules => < "test empty SYMLINK+ (empty override)", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", - not_exp_name => "wrong", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "right", + not_exp_name => "wrong", + }], rules => < "test multi matches", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "right", + }], rules => < "test multi matches 2", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "right", + }], rules => < "test multi matches 3", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "right", + }], rules => < "test multi matches 4", - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", + exp_name => "right", + }], rules => < "test multi matches 5", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + desc => "test multi matches 5", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 6", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 7", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 8", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 9", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 10", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "test multi matches 11", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => < "IMPORT parent test sequence 1/2 (keep)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "parent", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "parent", + }], option => "keep", rules => < "IMPORT parent test sequence 2/2 (keep)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "parentenv-parent_right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "parentenv-parent_right", + }], option => "clean", rules => < "GOTO test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "right", + }], rules => < "GOTO label does not exist", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "right", + }], rules => < "SYMLINK+ compare test", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", - not_exp_name => "wrong", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "right", + not_exp_name => "wrong", + }], rules => < "invalid key operation", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "yes", + }], rules => < "operator chars in attribute", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "yes", + }], rules => < "overlong comment line", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "yes", + }], rules => < "magic subsys/kernel lookup", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "00:16:41:e2:8d:ff", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "00:16:41:e2:8d:ff", + }], rules => < "TEST absolute path", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "there", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "there", + }], rules => < "TEST subsys/kernel lookup", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "yes", + }], rules => < "TEST relative path", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "relative", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "relative", + }], rules => < "TEST wildcard substitution (find queue/nr_requests)", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found-subdir", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found-subdir", + }], rules => < "TEST MODE=0000", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", - exp_perms => "0:0:0000", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "sda", + exp_perms => "0:0:0000", + exp_rem_error => "yes", + }], rules => < "TEST PROGRAM feeds OWNER, GROUP, MODE", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", - exp_perms => "1:1:0400", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "sda", + exp_perms => "1:1:0400", + exp_rem_error => "yes", + }], rules => < "TEST PROGRAM feeds MODE with overflow", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", - exp_perms => "0:0:0440", - exp_rem_error => "yes", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "sda", + exp_perms => "0:0:0440", + exp_rem_error => "yes", + }], rules => < "magic [subsys/sysname] attribute substitution", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda-8741C4G-end", - exp_perms => "0:0:0600", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "sda-8741C4G-end", + exp_perms => "0:0:0600", + }], rules => < "builtin path_id", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0", + }], rules => < "add and match tag", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad" , + }], rules => < "don't crash with lots of tags", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + }], rules => $rules_10k_tags . < "continuations", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => $rules_10k_tags_continuation . < "continuations with empty line", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + + }], rules => < "continuations with white only line", - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_name => "found", + not_exp_name => "bad", + }], rules => <{desc}\n"; - print "device \'$rules->{devpath}\' expecting node/link \'$rules->{exp_name}\'\n"; - - $rc = udev("add", $rules->{devpath}, \$rules->{rules}); - if ($rc != 0) { - print "$udev_bin add failed with code $rc\n"; - $error++; - } - if (defined($rules->{not_exp_name})) { - if ((-e "$udev_dev/$rules->{not_exp_name}") || - (-l "$udev_dev/$rules->{not_exp_name}")) { - print "nonexistent: error \'$rules->{not_exp_name}\' not expected to be there\n"; + if (defined($device->{not_exp_name})) { + if ((-e "$udev_dev/$device->{not_exp_name}") || + (-l "$udev_dev/$device->{not_exp_name}")) { + print "nonexistent: error \'$device->{not_exp_name}\' not expected to be there\n"; $error++; sleep(1); } } - - if ((-e "$udev_dev/$rules->{exp_name}") || - (-l "$udev_dev/$rules->{exp_name}")) { + if ((-e "$udev_dev/$device->{exp_name}") || + (-l "$udev_dev/$device->{exp_name}")) { my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, - $atime, $mtime, $ctime, $blksize, $blocks) = stat("$udev_dev/$rules->{exp_name}"); + $atime, $mtime, $ctime, $blksize, $blocks) = stat("$udev_dev/$device->{exp_name}"); - if (defined($rules->{exp_perms})) { - permissions_test($rules, $uid, $gid, $mode); + if (defined($device->{exp_perms})) { + permissions_test($device, $uid, $gid, $mode); } - if (defined($rules->{exp_majorminor})) { - major_minor_test($rules, $rdev); + if (defined($device->{exp_majorminor})) { + major_minor_test($device, $rdev); } - print "add: ok\n"; + print "add $device->{devpath}: ok\n"; } else { - print "add: error"; - if ($rules->{exp_add_error}) { + print "add $device->{devpath}: error"; + if ($device->{exp_add_error}) { print " as expected\n"; } else { print "\n"; @@ -1755,31 +2231,61 @@ sub run_test { sleep(1); } } +} + +sub check_remove { + my ($device) = @_; + + if ((-e "$udev_dev/$device->{exp_name}") || + (-l "$udev_dev/$device->{exp_name}")) { + print "remove $device->{devpath}: error"; + if ($device->{exp_rem_error}) { + print " as expected\n"; + } else { + print "\n"; + system("tree", "$udev_dev"); + print "\n"; + $error++; + sleep(1); + } + } else { + print "remove $device->{devpath}: ok\n"; + } +} + +sub run_test { + my ($rules, $number) = @_; + my $rc; + my @devices = @{$rules->{devices}}; + + print "TEST $number: $rules->{desc}\n"; + foreach my $dev (@devices) { + print "device \'$dev->{devpath}\' expecting node/link \'$dev->{exp_name}\'\n"; + $rc = udev("add", $dev->{devpath}, \$rules->{rules}); + if ($rc != 0) { + print "$udev_bin add failed with code $rc\n"; + $error++; + } + } + + foreach my $dev (@devices) { + check_add($dev); + } if (defined($rules->{option}) && $rules->{option} eq "keep") { print "\n\n"; return; } - $rc = udev("remove", $rules->{devpath}, \$rules->{rules}); - if ($rc != 0) { - print "$udev_bin remove failed with code $rc\n"; - $error++; - } - if ((-e "$udev_dev/$rules->{exp_name}") || - (-l "$udev_dev/$rules->{exp_name}")) { - print "remove: error"; - if ($rules->{exp_rem_error}) { - print " as expected\n"; - } else { - print "\n"; - system("tree", "$udev_dev"); - print "\n"; + foreach my $dev (@devices) { + $rc = udev("remove", $dev->{devpath}, \$rules->{rules}); + if ($rc != 0) { + print "$udev_bin remove failed with code $rc\n"; $error++; - sleep(1); } - } else { - print "remove: ok\n"; + } + foreach my $dev (@devices) { + check_remove($dev); } print "\n"; From af7ee3eae689f9c31b49ea13758ad9c901918ce3 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 23 Apr 2018 21:58:12 +0200 Subject: [PATCH 02/22] test/udev-test.pl: create rules only once It's not necessary to write the rules for every udev run, as we now may have many (rather than just 2) per test. --- test/udev-test.pl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index cf7c7e0bcd..1714b9c7da 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2069,14 +2069,18 @@ EOF }, ); -sub udev { - my ($action, $devpath, $rules) = @_; +sub create_rules { + my ($rules) = @_; # create temporary rules system("mkdir", "-p", "$udev_rules_dir"); open CONF, ">$udev_rules" || die "unable to create rules file: $udev_rules"; print CONF $$rules; close CONF; +} + +sub udev { + my ($action, $devpath) = @_; if ($valgrind > 0) { return system("$udev_bin_valgrind $action $devpath"); @@ -2259,9 +2263,10 @@ sub run_test { my @devices = @{$rules->{devices}}; print "TEST $number: $rules->{desc}\n"; + create_rules(\$rules->{rules}); foreach my $dev (@devices) { print "device \'$dev->{devpath}\' expecting node/link \'$dev->{exp_name}\'\n"; - $rc = udev("add", $dev->{devpath}, \$rules->{rules}); + $rc = udev("add", $dev->{devpath}); if ($rc != 0) { print "$udev_bin add failed with code $rc\n"; $error++; @@ -2278,7 +2283,7 @@ sub run_test { } foreach my $dev (@devices) { - $rc = udev("remove", $dev->{devpath}, \$rules->{rules}); + $rc = udev("remove", $dev->{devpath}); if ($rc != 0) { print "$udev_bin remove failed with code $rc\n"; $error++; From 09a4062d70b3a10d022e40066e2adf09df05bbbc Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 23 Apr 2018 21:59:05 +0200 Subject: [PATCH 03/22] test/udev-test.pl: allow concurrent additions and removals Allow testing cases where multiple devices are added and removed simultaneously. Tests are started as synchronously as possible using a semaphore, in order to test possible race conditions. If this isn't desired, the test parameter "sleep_us" can be set to the number of microseconds to wait between udev invocations. --- test/udev-test.pl | 90 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 18 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 1714b9c7da..64c21fa73e 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -18,6 +18,10 @@ use warnings; use strict; +use POSIX qw(WIFEXITED WEXITSTATUS); +use IPC::SysV qw(IPC_PRIVATE S_IRUSR S_IWUSR IPC_CREAT); +use IPC::Semaphore; +use Time::HiRes qw(usleep); my $udev_bin = "./test-udev"; my $valgrind = 0; @@ -2210,6 +2214,8 @@ sub check_add { sleep(1); } } + + print "device \'$device->{devpath}\' expecting node/link \'$device->{exp_name}\'\n"; if ((-e "$udev_dev/$device->{exp_name}") || (-l "$udev_dev/$device->{exp_name}")) { @@ -2257,21 +2263,72 @@ sub check_remove { } } +sub run_udev { + my ($action, $dev, $sleep_us, $sema) = @_; + + # Notify main process that this worker has started + $sema->op(0, 1, 0); + + # Wait for start + $sema->op(0, 0, 0); + usleep($sleep_us) if defined ($sleep_us); + my $rc = udev($action, $dev->{devpath}); + exit $rc; +} + +sub fork_and_run_udev { + my ($action, $rules, $sema) = @_; + my @devices = @{$rules->{devices}}; + my $dev; + my $k = 0; + + $sema->setval(0, 1); + foreach $dev (@devices) { + my $pid = fork(); + + if (!$pid) { + run_udev($action, $dev, + defined($rules->{sleep_us}) ? $k * $rules->{sleep_us} : undef, + $sema); + } else { + $dev->{pid} = $pid; + } + $k++; + } + + # This operation waits for all workers to become ready, and + # starts them off when that's the case. + $sema->op(0, -($#devices + 2), 0); + + foreach $dev (@devices) { + my $rc; + my $pid; + + $pid = waitpid($dev->{pid}, 0); + if ($pid == -1) { + print "error waiting for pid dev->{pid}\n"; + $error += 1; + } + if (WIFEXITED($?)) { + $rc = WEXITSTATUS($?); + + if ($rc) { + print "$udev_bin $action for $dev->{devpath} failed with code $rc\n"; + $error += 1; + } + } + } +} + sub run_test { - my ($rules, $number) = @_; + my ($rules, $number, $sema) = @_; my $rc; my @devices = @{$rules->{devices}}; print "TEST $number: $rules->{desc}\n"; create_rules(\$rules->{rules}); - foreach my $dev (@devices) { - print "device \'$dev->{devpath}\' expecting node/link \'$dev->{exp_name}\'\n"; - $rc = udev("add", $dev->{devpath}); - if ($rc != 0) { - print "$udev_bin add failed with code $rc\n"; - $error++; - } - } + + fork_and_run_udev("add", $rules, $sema); foreach my $dev (@devices) { check_add($dev); @@ -2282,13 +2339,8 @@ sub run_test { return; } - foreach my $dev (@devices) { - $rc = udev("remove", $dev->{devpath}); - if ($rc != 0) { - print "$udev_bin remove failed with code $rc\n"; - $error++; - } - } + fork_and_run_udev("remove", $rules, $sema); + foreach my $dev (@devices) { check_remove($dev); } @@ -2350,12 +2402,13 @@ foreach my $arg (@ARGV) { push(@list, $arg); } } +my $sema = IPC::Semaphore->new(IPC_PRIVATE, 1, S_IRUSR | S_IWUSR | IPC_CREAT); if ($list[0]) { foreach my $arg (@list) { if (defined($tests[$arg-1]->{desc})) { print "udev-test will run test number $arg:\n\n"; - run_test($tests[$arg-1], $arg); + run_test($tests[$arg-1], $arg, $sema); } else { print "test does not exist.\n"; } @@ -2365,11 +2418,12 @@ if ($list[0]) { print "\nudev-test will run ".($#tests + 1)." tests:\n\n"; foreach my $rules (@tests) { - run_test($rules, $test_num); + run_test($rules, $test_num, $sema); $test_num++; } } +$sema->remove; print "$error errors occurred\n\n"; cleanup(); From f0dccf01a7b4e72278e14effd74782ea83d0a73b Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 09:38:26 +0200 Subject: [PATCH 04/22] test/udev-test.pl: use computed devnode name More often than not, the created devnode is the basename of the sysfs entry. The "devnode" device may be used to override the auto-detected node name. Permissions and major/minor number are now verified on the devnode itself, not on symlinks. For those tests where exp_name is set to the computed devnode name, the explicit "exp_name" can be removed. "exp_name" is only required for symlinks. This allows separate testing for devnodes and symlinks an a follow-up patch. --- test/udev-test.pl | 92 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 26 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 64c21fa73e..1becfab321 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -55,12 +55,10 @@ my @tests = ( devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda" , exp_rem_error => "yes", }, { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "sda1" , exp_rem_error => "yes", }], rules => < [ { devpath => "/devices/virtual/block/fake!blockdev0", + devnode => "fake/blockdev0", exp_name => "is/a/fake/blockdev0" , }], rules => < [ { devpath => "/devices/virtual/block/fake!blockdev0", - exp_name => "fake/blockdev0" , + devnode => "fake/blockdev0", exp_rem_error => "yes", }], rules => < [ { devpath => "/devices/virtual/tty/tty33", - exp_name => "tty33", exp_perms => "0:0:0600", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "1::", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => ":1:0660", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "::0060", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "1:1:0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "1:1:0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "1:1:0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "ttyACM0", exp_perms => "1:2:0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", exp_perms => "0:0:0000", exp_rem_error => "yes", }], @@ -1935,7 +1925,6 @@ EOF devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", exp_perms => "1:1:0400", exp_rem_error => "yes", }], @@ -1949,7 +1938,6 @@ EOF devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda", exp_perms => "0:0:0440", exp_rem_error => "yes", }], @@ -2203,6 +2191,44 @@ sub udev_setup { return 1; } +sub get_devnode { + my ($device) = @_; + my $devnode; + + if (defined($device->{devnode})) { + $devnode = "$udev_dev/$device->{devnode}"; + } else { + $devnode = "$device->{devpath}"; + $devnode =~ s!.*/!$udev_dev/!; + } + return $devnode; +} + +sub check_devnode { + my ($device) = @_; + my $devnode = get_devnode($device); + + my @st = lstat("$devnode"); + if (! (-b _ || -c _)) { + print "add $devnode: error\n"; + system("tree", "$udev_dev"); + $error++; + return undef; + } + + my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = @st; + + if (defined($device->{exp_perms})) { + permissions_test($device, $uid, $gid, $mode); + } + if (defined($device->{exp_majorminor})) { + major_minor_test($device, $rdev); + } + print "add $devnode: ok\n"; + return $devnode; +} + sub check_add { my ($device) = @_; @@ -2215,19 +2241,13 @@ sub check_add { } } + my $devnode = check_devnode($device); + print "device \'$device->{devpath}\' expecting node/link \'$device->{exp_name}\'\n"; + return if (!defined($device->{exp_name})); + if ((-e "$udev_dev/$device->{exp_name}") || (-l "$udev_dev/$device->{exp_name}")) { - - my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, - $atime, $mtime, $ctime, $blksize, $blocks) = stat("$udev_dev/$device->{exp_name}"); - - if (defined($device->{exp_perms})) { - permissions_test($device, $uid, $gid, $mode); - } - if (defined($device->{exp_majorminor})) { - major_minor_test($device, $rdev); - } print "add $device->{devpath}: ok\n"; } else { print "add $device->{devpath}: error"; @@ -2243,12 +2263,32 @@ sub check_add { } } +sub check_remove_devnode { + my ($device) = @_; + my $devnode = get_devnode($device); + + if (-e "$devnode") { + print "remove $devnode: error"; + print "\n"; + system("tree", "$udev_dev"); + print "\n"; + $error++; + sleep(1); + } else { + print "remove $devnode: ok\n"; + } +} + sub check_remove { my ($device) = @_; + check_remove_devnode($device); + + return if (!defined($device->{exp_name})); + if ((-e "$udev_dev/$device->{exp_name}") || (-l "$udev_dev/$device->{exp_name}")) { - print "remove $device->{devpath}: error"; + print "remove $device->{exp_name}: error"; if ($device->{exp_rem_error}) { print " as expected\n"; } else { @@ -2259,7 +2299,7 @@ sub check_remove { sleep(1); } } else { - print "remove $device->{devpath}: ok\n"; + print "remove $device->{exp_name}: ok\n"; } } From 997683c8f152e1c139a7ce537de81a0aeae4627f Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 10:50:24 +0200 Subject: [PATCH 05/22] test/udev-test.pl: test correctness of symlink targets Test if symlinks are created correctly by comparing the symlink targets to the devnode path. This implies (for the symlink) that major/minor numbers and permissions are correct, as we have tested that on the devnode already. --- test/udev-test.pl | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 1becfab321..cbe45f37f4 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -22,6 +22,7 @@ use POSIX qw(WIFEXITED WEXITSTATUS); use IPC::SysV qw(IPC_PRIVATE S_IRUSR S_IWUSR IPC_CREAT); use IPC::Semaphore; use Time::HiRes qw(usleep); +use Cwd qw(getcwd abs_path); my $udev_bin = "./test-udev"; my $valgrind = 0; @@ -2243,14 +2244,26 @@ sub check_add { my $devnode = check_devnode($device); - print "device \'$device->{devpath}\' expecting node/link \'$device->{exp_name}\'\n"; return if (!defined($device->{exp_name})); - if ((-e "$udev_dev/$device->{exp_name}") || - (-l "$udev_dev/$device->{exp_name}")) { - print "add $device->{devpath}: ok\n"; + my @st = lstat("$udev_dev/$device->{exp_name}"); + if (-l _) { + my $cwd = getcwd(); + my $dir = "$udev_dev/$device->{exp_name}"; + $dir =~ s!/[^/]*$!!; + my $tgt = readlink("$udev_dev/$device->{exp_name}"); + $tgt = abs_path("$dir/$tgt"); + $tgt =~ s!^$cwd/!!; + + if ($tgt ne $devnode) { + print "symlink $device->{exp_name}: error, found -> $tgt\n"; + $error++; + system("tree", "$udev_dev"); + } else { + print "symlink $device->{exp_name}: ok\n"; + } } else { - print "add $device->{devpath}: error"; + print "symlink $device->{exp_name}: error"; if ($device->{exp_add_error}) { print " as expected\n"; } else { From e62acc3159935781f05fa59c48e5a74e85c61ce2 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 17:15:58 +0200 Subject: [PATCH 06/22] test/udev-test.pl: allow checking multiple symlinks Instead of testing the existence or non-exisitence of just a single symlink, allow testing of several links per device. Change the test definitions accordingly. --- test/udev-test.pl | 495 +++++++++++++++++++++++++++------------------- 1 file changed, 296 insertions(+), 199 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index cbe45f37f4..6302aacbe9 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -71,7 +71,7 @@ EOF devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk" , + exp_links => ["boot_disk"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk" , + exp_links => ["boot_disk"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "boot_disk" , + exp_links => ["boot_disk"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1" , + exp_links => ["boot_disk1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1" , + exp_links => ["boot_disk1", "boot_disk1-4", "boot_disk1-5"], + not_exp_links => ["boot_disk1-1", "boot_disk1-2", "boot_disk1-3"] }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1" , + exp_links => ["boot_disk1"], + not_exp_links => ["boot_diskX1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "boot_disk1" , + exp_links => ["boot_disk1", "boot_diskXY1"], + not_exp_links => ["boot_diskXX1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0" , + exp_links => ["modem/0", "catch-all"], }], rules => < "catch device by * - take 2", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0" , + exp_links => ["modem/0"], + not_exp_links => ["bad"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0" , + exp_links => ["modem/0"], + not_exp_links => ["modem/0-1", "modem/0-2"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem/0" , + exp_links => ["modem/0"], + not_exp_links => ["modem/0-1", "modem/0-2"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "whitespace" , + exp_links => ["whitespace"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "aaa", + exp_links => ["aaa"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "sub/direct/ory/modem" , + exp_links => ["sub/direct/ory/modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "first_disk5" , + exp_links => ["first_disk5"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" , + exp_links => ["Major:8:minor:5:kernelnumber:5:id:0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node12345678", + exp_links => ["node12345678"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "disk-ATA-sda" , + exp_links => ["disk-ATA-sda"], + not_exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "special-device-5" , - not_exp_name => "not" , + exp_links => ["special-device-5"], + not_exp_links => ["not"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "newline_removed" , + exp_links => ["newline_removed"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "test-0:0:0:0" , + exp_links => ["test-0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo9" , + exp_links => ["foo9"], + not_exp_links => ["foo3", "foo4", "foo5", "foo6", "foo7", "foo8"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "bar9" , + exp_links => ["bar9"], + not_exp_links => ["foo3", "foo4", "foo5", "foo6", "foo7", "foo8"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo7" , + exp_links => ["foo7"], + not_exp_links => ["foo3", "foo4", "foo5", "foo6", "foo8"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2" , + exp_links => ["foo2"], + not_exp_links => ["foo1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2" , + exp_links => ["foo2"], + not_exp_links => ["foo1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "foo2" , + exp_links => ["foo2"], + not_exp_links => ["foo1", "foo3"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "my-foo9" , + exp_links => ["my-foo9"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "my-foo8" , + exp_links => ["my-foo8"], + not_exp_links => ["my-foo3", "my-foo4", "my-foo5", "my-foo6", "my-foo7", "my-foo9"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + exp_links => ["Major:8-minor:5-kernelnumber:5-id:0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "Major:8-minor:5-kernelnumber:5-id:0:0:0:0", + exp_links => ["Major:8-minor:5-kernelnumber:5-id:0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "850:0:0:05" , + exp_links => ["850:0:0:05"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "855" , + exp_links => ["855"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "8550:0:0:0" , + exp_links => ["8550:0:0:0"], }], rules => < [ { devpath => "/devices/virtual/tty/console", - exp_name => "TTY", + exp_links => ["TTY"], + not_exp_links => ["foo"], }], rules => < [ { devpath => "/devices/virtual/tty/console", - exp_name => "TTY" , + exp_links => ["TTY"], + not_exp_links => ["foo"], }], rules => < [ { devpath => "/devices/virtual/tty/console", - exp_name => "foo" , + exp_links => ["foo", "TTY"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "empty" , + exp_links => ["empty", "not-something"], + not_exp_links => ["something", "not-empty"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "non-existent" , + exp_links => ["non-existent", "wrong"], + not_exp_links => ["something", "empty", "not-empty", + "not-something", "something"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0" , + exp_links => ["scsi-0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem" , + exp_links => ["modem"], }], rules => < "/devices/virtual/block/fake!blockdev0", devnode => "fake/blockdev0", - exp_name => "is/a/fake/blockdev0" , + exp_links => ["is/a/fake/blockdev0"], + not_exp_links => ["is/not/a/fake/blockdev0", "modem"], }], rules => < "/devices/virtual/block/fake!blockdev0", devnode => "fake/blockdev0", - exp_rem_error => "yes", + not_exp_links => ["modem"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + exp_links => ["scsi-0:0:0:0"], + not_exp_links => ["no-match", "short-id", "not-scsi"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + exp_links => ["scsi-0:0:0:0"], + not_exp_links => ["no-match", "before"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + exp_links => ["scsi-0:0:0:0", "before"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "scsi-0:0:0:0", + exp_links => ["scsi-0:0:0:0", "before"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "driver-is-sd", + exp_links => ["driver-is-sd"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "driver-is-ahci", + exp_links => ["driver-is-ahci"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ignored", + exp_links => ["ignored"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "matched-with-space", + exp_links => ["matched-with-space"], + not_exp_links => ["wrong-to-ignore"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => "1::0600", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => ":1:0660", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => "daemon::0600", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => ":daemon:0660", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => "root:audio:0660", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => "::0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_perms => "1:1:0777", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], exp_majorminor => "8:0", }], rules => < [ { devpath => "/devices/virtual/misc/misc-fake1", - exp_name => "node", + exp_links => ["node"], exp_majorminor => "4095:1", }], rules => < [ { devpath => "/devices/virtual/misc/misc-fake89999", - exp_name => "node", + exp_links => ["node"], exp_majorminor => "4095:89999", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink2-ttyACM0", + exp_links => ["symlink1-0", "symlink2-ttyACM0", "symlink3-"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "one", - not_exp_name => " ", + exp_links => ["one", "two"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < "symlink with space and var with space, part 1", + desc => "symlink with space and var with space", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "first", - not_exp_name => " ", + exp_links => ["first"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "name-one_two_three-end", - not_exp_name => " ", + exp_links => ["name-one_two_three-end"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "another_symlink", - not_exp_name => " ", + exp_links => ["another_symlink"], + not_exp_links => [" "], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "modem0", + exp_links => ["modem0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "second-0" , + exp_links => ["first-0", "second-0", "third-0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => ".", + exp_links => ["."], exp_add_error => "yes", exp_rem_error => "yes", }], @@ -1148,7 +1176,7 @@ EOF devices => [ { devpath => "/devices/virtual/tty/tty0", - exp_name => "link", + exp_links => ["link"], exp_add_error => "yes", exp_rem_error => "yes", }], @@ -1162,7 +1190,7 @@ EOF devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink0", + exp_links => ["symlink0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "symlink-ttyACM0", + exp_links => ["symlink-ttyACM0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "major-166:0", + exp_links => ["major-166:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "symlink-0:0:0:0", + exp_links => ["symlink-0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "test", + exp_links => ["test"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "test", + exp_links => ["test"], + not_exp_links => ["symlink", "this"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "this", + exp_links => ["test", "this"], + not_exp_links => ["symlink"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "test", + exp_links => ["test", "this"], + not_exp_links => ["symlink"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "166:0", + exp_links => ["166:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "link1", + exp_links => ["link1", "link2"], + not_exp_links => ["node"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_name => "link4", + exp_links => ["link1", "link2", "link3", "link4"], + not_exp_links => ["node"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], + not_exp_links => ["should_not_match", "should_not_match2"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], + not_exp_links => ["should_not_match"] }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node", + exp_links => ["node"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "sda-part-1", + exp_links => ["sda-part-1"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "start-/dev-end", + exp_links => ["start-/dev-end"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "last", + exp_links => ["last"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "match", + exp_links => ["match", "before"], + not_exp_links => ["matches-but-is-negated"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "not-anything", + exp_links => ["before", "not-anything"], + not_exp_links => ["matches-but-is-negated"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "nonzero-program", + exp_links => ["before", "nonzero-program"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + exp_links => ["true"], + not_exp_links => ["bad", "wrong"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + exp_links => ["true"], + not_exp_links => ["bad", "wrong", "no"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + exp_links => ["true", "before"], + not_exp_links => ["no"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "true", + exp_links => ["true", "before"], + not_exp_links => ["no", "bad"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "part", - }], + exp_links => ["part"], + not_exp_links => ["disk"], + }, + ], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "sane", + exp_links => ["sane"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "uber", + exp_links => ["uber"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "replaced", + exp_links => ["replaced"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "serial-354172020305000", + exp_links => ["serial-354172020305000"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + exp_links => ["ok"], + not_exp_links => ["not-1-ok", "not-2-ok", "not-3-ok"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + exp_links => ["ok"], + not_exp_links => ["unknown-not-ok"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + exp_links => ["ok"], exp_perms => "root:tty:0640", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "ok", + exp_links => ["ok"], exp_perms => "root:tty:0640", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "node-add-me", + exp_links => ["node-add-me"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "three", - not_exp_name => "two", + exp_links => ["three"], + not_exp_links => ["two", "one"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", - not_exp_name => "wrong", + exp_links => ["right"], + not_exp_links => ["wrong"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + exp_links => ["right", "before"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + exp_links => ["right", "before"], + not_exp_links => ["nomatch"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + exp_links => ["right"], + not_exp_links => ["nomatch", "wrong1", "wrong2"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_name => "right", + exp_links => ["right"], + not_exp_links => ["nomatch", "wrong1", "wrong2", "wrong3"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "parent", + exp_links => ["parent"], }], option => "keep", rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "parentenv-parent_right", + exp_links => ["parentenv-parent_right"], }], option => "clean", rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", + exp_links => ["right"], + not_exp_test => ["wrong", "wrong2"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", + exp_links => ["right"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "right", - not_exp_name => "wrong", + exp_links => ["right", "link"], + not_exp_links => ["wrong"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "yes", + exp_links => ["yes"], + not_exp_links => ["no"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "yes", + exp_links => ["yes"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_name => "yes", + exp_links => ["yes"], + not_exp_links => ["no"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "00:16:41:e2:8d:ff", + exp_links => ["00:16:41:e2:8d:ff"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "there", + exp_links => ["there"], + not_exp_links => ["notthere"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "yes", + exp_links => ["yes"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "relative", + exp_links => ["relative"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found-subdir", + exp_links => ["found-subdir"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "sda-8741C4G-end", + exp_links => ["sda-8741C4G-end"], exp_perms => "0:0:0600", }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0", + exp_links => ["disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", - not_exp_name => "bad" , + exp_links => ["found"], + not_exp_links => ["bad"], }], rules => < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], }], rules => $rules_10k_tags . < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => $rules_10k_tags_continuation . < [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], @@ -2046,7 +2098,7 @@ TAGS=="aaa", SYMLINK+="bad" devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", - exp_name => "found", + exp_links => ["found"], not_exp_name => "bad", }], rules => <{not_exp_name})) { - if ((-e "$udev_dev/$device->{not_exp_name}") || - (-l "$udev_dev/$device->{not_exp_name}")) { - print "nonexistent: error \'$device->{not_exp_name}\' not expected to be there\n"; - $error++; - sleep(1); - } - } + my $cwd = getcwd(); + my $dir = "$udev_dev/$link"; + my $tgt = readlink("$udev_dev/$link"); + $dir =~ s!/[^/]*$!!; + $tgt = abs_path("$dir/$tgt"); + $tgt =~ s!^$cwd/!!; + return $tgt; +} - my $devnode = check_devnode($device); +sub check_link_add { + my ($link, $devnode, $err_expected) = @_; - return if (!defined($device->{exp_name})); - - my @st = lstat("$udev_dev/$device->{exp_name}"); + my @st = lstat("$udev_dev/$link"); if (-l _) { - my $cwd = getcwd(); - my $dir = "$udev_dev/$device->{exp_name}"; - $dir =~ s!/[^/]*$!!; - my $tgt = readlink("$udev_dev/$device->{exp_name}"); - $tgt = abs_path("$dir/$tgt"); - $tgt =~ s!^$cwd/!!; + my $tgt = get_link_target($link); if ($tgt ne $devnode) { - print "symlink $device->{exp_name}: error, found -> $tgt\n"; + print "symlink $link: error, found -> $tgt\n"; $error++; system("tree", "$udev_dev"); } else { - print "symlink $device->{exp_name}: ok\n"; + print "symlink $link: ok\n"; } } else { - print "symlink $device->{exp_name}: error"; - if ($device->{exp_add_error}) { + print "symlink $link: error"; + if ($err_expected) { print " as expected\n"; } else { print "\n"; @@ -2276,6 +2322,49 @@ sub check_add { } } +sub check_link_nonexistent { + my ($link, $devnode, $err_expected) = @_; + + if ((-e "$udev_dev/$link") || (-l "$udev_dev/$link")) { + my $tgt = get_link_target($link); + + if ($tgt ne $devnode) { + print "nonexistent: '$link' points to other device (ok)\n"; + } else { + print "nonexistent: error \'$link\' should not be there"; + if ($err_expected) { + print " (as expected)\n"; + } else { + print "\n"; + system("tree", "$udev_dev"); + print "\n"; + $error++; + sleep(1); + } + } + } else { + print "nonexistent $link: ok\n"; + } +} + +sub check_add { + my ($device) = @_; + my $devnode = check_devnode($device); + + if (defined($device->{exp_links})) { + foreach my $link (@{$device->{exp_links}}) { + check_link_add($link, $devnode, + $device->{exp_add_error}); + } + } + if (defined $device->{not_exp_links}) { + foreach my $link (@{$device->{not_exp_links}}) { + check_link_nonexistent($link, $devnode, + $device->{exp_nodev_error}); + } + } +} + sub check_remove_devnode { my ($device) = @_; my $devnode = get_devnode($device); @@ -2292,17 +2381,13 @@ sub check_remove_devnode { } } -sub check_remove { - my ($device) = @_; +sub check_link_remove { + my ($link, $err_expected) = @_; - check_remove_devnode($device); - - return if (!defined($device->{exp_name})); - - if ((-e "$udev_dev/$device->{exp_name}") || - (-l "$udev_dev/$device->{exp_name}")) { - print "remove $device->{exp_name}: error"; - if ($device->{exp_rem_error}) { + if ((-e "$udev_dev/$link") || + (-l "$udev_dev/$link")) { + print "remove $link: error"; + if ($err_expected) { print " as expected\n"; } else { print "\n"; @@ -2312,7 +2397,19 @@ sub check_remove { sleep(1); } } else { - print "remove $device->{exp_name}: ok\n"; + print "remove $link: ok\n"; + } +} + +sub check_remove { + my ($device) = @_; + + check_remove_devnode($device); + + return if (!defined($device->{exp_links})); + + foreach my $link (@{$device->{exp_links}}) { + check_link_remove($link, $device->{exp_rem_error}); } } From 46bc71b2b73f8a1e27dc5e142730e9877dd05e3e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 17:57:47 +0200 Subject: [PATCH 07/22] test/udev-test.pl: fix wrong test descriptions udev hasn't supported renaming device nodes for some time. --- test/udev-test.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 6302aacbe9..15693c26b1 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -212,7 +212,7 @@ KERNEL=="ttyACM[0-9]*", SYMLINK+="modem/%n" EOF }, { - desc => "replace kernel name", + desc => "don't replace kernel name", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -223,7 +223,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem" EOF }, { - desc => "Handle comment lines in config file (and replace kernel name)", + desc => "Handle comment lines in config file (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -236,7 +236,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem" EOF }, { - desc => "Handle comment lines in config file with whitespace (and replace kernel name)", + desc => "Handle comment lines in config file with whitespace (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -249,7 +249,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem" EOF }, { - desc => "Handle whitespace only lines (and replace kernel name)", + desc => "Handle whitespace only lines (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -267,7 +267,7 @@ KERNEL=="ttyACM0", SYMLINK+="whitespace" EOF }, { - desc => "Handle empty lines in config file (and replace kernel name)", + desc => "Handle empty lines in config file (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -280,7 +280,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem" EOF }, { - desc => "Handle backslashed multi lines in config file (and replace kernel name)", + desc => "Handle backslashed multi lines in config file (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", @@ -303,8 +303,9 @@ EOF KERNEL=="ttyACM0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", SYMLINK+="aaa" EOF }, + # 20 { - desc => "Handle stupid backslashed multi lines in config file (and replace kernel name)", + desc => "Handle stupid backslashed multi lines in config file (and don't replace kernel name)", devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", From 17cce031531a5d3f38a27374c99d1bdba5959dbd Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 18:08:18 +0200 Subject: [PATCH 08/22] test/udev-test.pl: last_rule is unsupported the "last_rule" option hasn't been supported for some time. Therefore this test fails if a "not_exp_links" attribute is added, as it should be. Mark it appropriately. --- test/udev-test.pl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/udev-test.pl b/test/udev-test.pl index 15693c26b1..58ce49c161 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -1373,11 +1373,14 @@ SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="start-%r-end" EOF }, { + # This is not supported any more desc => "last_rule option", devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", exp_links => ["last"], + not_exp_links => ["very-last"], + exp_nodev_error => "yes", }], rules => < Date: Tue, 24 Apr 2018 18:09:50 +0200 Subject: [PATCH 09/22] test/udev-test.pl: Make some tests a little harder Add some rules that make it a bit harder to pass, mainly the non-existence checks. --- test/udev-test.pl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 58ce49c161..a2f9748d0a 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -1358,7 +1358,7 @@ EOF exp_links => ["sda-part-1"], }], rules => < ["part"], not_exp_links => ["disk"], }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", + exp_links => ["disk"], + not_exp_links => ["part"], + }, ], rules => < < < "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", exp_perms => "1:1:0400", - exp_rem_error => "yes", }], rules => < Date: Tue, 24 Apr 2018 18:16:59 +0200 Subject: [PATCH 10/22] test/udev-test.pl: remove bogus rules from magic subsys test These rules have survived from an ancient version of the code and save no purpose any more. --- test/udev-test.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index a2f9748d0a..cd533a7cf5 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2017,8 +2017,6 @@ EOF exp_perms => "0:0:0600", }], rules => < Date: Tue, 24 Apr 2018 18:27:25 +0200 Subject: [PATCH 11/22] test/udev-test.pl: merge "space and var with space" tests As we can check multiple links in a single test now, these 3 tests can be merged into one. --- test/udev-test.pl | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index cd533a7cf5..097b9e20b7 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -1103,34 +1103,9 @@ EOF devices => [ { devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_links => ["first"], - not_exp_links => [" "], - }], - rules => < "symlink with space and var with space, part 2", - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_links => ["name-one_two_three-end"], - not_exp_links => [" "], - }], - rules => < "symlink with space and var with space, part 3", - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0", - exp_links => ["another_symlink"], - not_exp_links => [" "], + exp_links => ["first", "name-one_two_three-end", + "another_symlink", "a", "b", "c"], + not_exp_links => [" "], }], rules => < Date: Tue, 24 Apr 2018 18:30:09 +0200 Subject: [PATCH 12/22] test/udev-test.pl: merge import parent tests into one As we can test multiple devices and multiple links per device in one test now, these two tests can be merged into one. --- test/udev-test.pl | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 097b9e20b7..3228614ebe 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -1781,28 +1781,21 @@ TAGS=="aaa||bbb||ccc", SYMLINK+="bad" EOF }, { - desc => "IMPORT parent test sequence 1/2 (keep)", + desc => "IMPORT parent test", devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda", exp_links => ["parent"], - }], - option => "keep", - rules => < "IMPORT parent test sequence 2/2 (keep)", - devices => [ + }, { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", exp_links => ["parentenv-parent_right"], }], - option => "clean", + sleep_us => 500000, # Serialized! We need to sleep here after adding sda rules => < Date: Tue, 24 Apr 2018 20:55:01 +0200 Subject: [PATCH 13/22] test/udev-test.pl: count "good" results This is helpful to catch possible regressions in the test. Also, don't count wait() errors, they are likely not udev errors. --- test/udev-test.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 3228614ebe..a084343f3d 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2114,6 +2114,7 @@ sub udev { } my $error = 0; +my $good = 0; sub permissions_test { my($rules, $uid, $gid, $mode) = @_; @@ -2144,6 +2145,7 @@ sub permissions_test { } if ($wrong == 0) { print "permissions: ok\n"; + $good++; } else { printf " expected permissions are: %s:%s:%#o\n", $1, $2, oct($3); printf " created permissions are : %i:%i:%#o\n", $uid, $gid, $mode & 07777; @@ -2169,6 +2171,7 @@ sub major_minor_test { } if ($wrong == 0) { print "major:minor: ok\n"; + $good++; } else { printf " expected major:minor is: %i:%i\n", $1, $2; printf " created major:minor is : %i:%i\n", $major, $minor; @@ -2254,6 +2257,7 @@ sub check_devnode { major_minor_test($device, $rdev); } print "add $devnode: ok\n"; + $good++; return $devnode; } @@ -2282,11 +2286,13 @@ sub check_link_add { system("tree", "$udev_dev"); } else { print "symlink $link: ok\n"; + $good++; } } else { print "symlink $link: error"; if ($err_expected) { print " as expected\n"; + $good++; } else { print "\n"; system("tree", "$udev_dev"); @@ -2305,10 +2311,12 @@ sub check_link_nonexistent { if ($tgt ne $devnode) { print "nonexistent: '$link' points to other device (ok)\n"; + $good++; } else { print "nonexistent: error \'$link\' should not be there"; if ($err_expected) { print " (as expected)\n"; + $good++; } else { print "\n"; system("tree", "$udev_dev"); @@ -2319,6 +2327,7 @@ sub check_link_nonexistent { } } else { print "nonexistent $link: ok\n"; + $good++; } } @@ -2353,6 +2362,7 @@ sub check_remove_devnode { sleep(1); } else { print "remove $devnode: ok\n"; + $good++; } } @@ -2364,6 +2374,7 @@ sub check_link_remove { print "remove $link: error"; if ($err_expected) { print " as expected\n"; + $good++; } else { print "\n"; system("tree", "$udev_dev"); @@ -2373,6 +2384,7 @@ sub check_link_remove { } } else { print "remove $link: ok\n"; + $good++; } } @@ -2432,7 +2444,6 @@ sub fork_and_run_udev { $pid = waitpid($dev->{pid}, 0); if ($pid == -1) { print "error waiting for pid dev->{pid}\n"; - $error += 1; } if (WIFEXITED($?)) { $rc = WEXITSTATUS($?); @@ -2440,6 +2451,8 @@ sub fork_and_run_udev { if ($rc) { print "$udev_bin $action for $dev->{devpath} failed with code $rc\n"; $error += 1; + } else { + $good++; } } } @@ -2549,7 +2562,7 @@ if ($list[0]) { } $sema->remove; -print "$error errors occurred\n\n"; +print "$error errors occurred. $good good results.\n\n"; cleanup(); From 4a0ec82daf32446519e1d86329bb802325b82104 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 22:04:55 +0200 Subject: [PATCH 14/22] tests/udev-test.pl: add multiple device test Add 4 new tests using multiple devices. Number 2-4 use many devices claiming the same symlink, where only one device has a higher priority thatn the others. They fail sporadically with the current code, if a race condition causes the symlink to point to the wrong device. Test 4 is like test 2 with sleeps in between, it's much less likely to fail. --- test/udev-test.pl | 169 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/test/udev-test.pl b/test/udev-test.pl index a084343f3d..36028ba617 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2085,6 +2085,175 @@ KERNEL=="sda", TAG+="aaa" \\ KERNEL=="sdb", TAG+="bbb" TAGS=="foo", SYMLINK+="found" TAGS=="aaa", SYMLINK+="bad" +EOF + }, + { + desc => "multiple devices", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_links => ["part-1"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_links => ["part-5"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", + exp_links => ["part-6"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", + exp_links => ["part-7"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", + exp_links => ["part-8"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", + exp_links => ["part-9"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", + exp_links => ["part-10"], + }, + ], + rules => < "multiple devices, same link name, positive prio", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_links => ["part-1"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_links => ["part-5"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", + not_exp_links => ["partition"], + exp_links => ["part-6"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", + exp_links => ["part-7", "partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", + not_exp_links => ["partition"], + exp_links => ["part-8"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", + not_exp_links => ["partition"], + exp_links => ["part-9"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", + not_exp_links => ["partition"], + exp_links => ["part-10"], + }, + ], + rules => < "multiple devices, same link name, negative prio", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_links => ["part-1"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_links => ["part-5"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", + not_exp_links => ["partition"], + exp_links => ["part-6"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", + exp_links => ["part-7", "partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", + not_exp_links => ["partition"], + exp_links => ["part-8"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", + not_exp_links => ["partition"], + exp_links => ["part-9"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", + not_exp_links => ["partition"], + exp_links => ["part-10"], + }, + ], + rules => < "multiple devices, same link name, positive prio, sleep", + devices => [ + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_links => ["part-1"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", + exp_links => ["part-5"], + not_exp_links => ["partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", + not_exp_links => ["partition"], + exp_links => ["part-6"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", + exp_links => ["part-7", "partition"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", + not_exp_links => ["partition"], + exp_links => ["part-8"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", + not_exp_links => ["partition"], + exp_links => ["part-9"], + }, + { + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", + not_exp_links => ["partition"], + exp_links => ["part-10"], + }, + ], + sleep_us => 10000, + rules => < Date: Tue, 24 Apr 2018 22:24:43 +0200 Subject: [PATCH 15/22] test/udev-test.pl: add repeat count for easier reproduction of sporadic test failures. --- test/udev-test.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/udev-test.pl b/test/udev-test.pl index 36028ba617..a19cc9f23d 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2125,6 +2125,7 @@ EOF }, { desc => "multiple devices, same link name, positive prio", + repeat => 100, devices => [ { devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", @@ -2635,6 +2636,7 @@ sub run_test { print "TEST $number: $rules->{desc}\n"; create_rules(\$rules->{rules}); + REPEAT: fork_and_run_udev("add", $rules, $sema); foreach my $dev (@devices) { @@ -2653,6 +2655,9 @@ sub run_test { } print "\n"; + if (defined($rules->{repeat}) && --($rules->{repeat}) > 0) { + goto REPEAT; + } if (defined($rules->{option}) && $rules->{option} eq "clean") { udev_setup(); From eb44d715ebee2fe11288433b99f8e1dc5fdac84a Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 25 Apr 2018 09:54:26 +0200 Subject: [PATCH 16/22] test/udev-test.pl: generator for large list of block devices Manually listing all devices in the test definition becomes cumbersome with lots of devices. Add a function that scans on all block devices in the test sysfs and generates a list of devices to test. --- test/udev-test.pl | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index a19cc9f23d..790387e680 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -50,6 +50,50 @@ for (my $i = 1; $i < 10000; ++$i) { } $rules_10k_tags_continuation .= "TAG+=\"test10000\"\\n"; +# Create a device list with all block devices under /sys +# (except virtual devices and cd-roms) +# the optional argument exp_func returns expected and non-expected +# symlinks for the device. +sub all_block_devs { + my ($exp_func) = @_; + my @devices; + + foreach my $bd (glob "$udev_sys/dev/block/*") { + my $tgt = readlink($bd); + my ($exp, $notexp) = (undef, undef); + + next if ($tgt =~ m!/virtual/! || $tgt =~ m!/sr[0-9]*$!); + + $tgt =~ s!^\.\./\.\.!!; + ($exp, $notexp) = $exp_func->($tgt) if defined($exp_func); + my $device = { + devpath => $tgt, + exp_links => $exp, + not_exp_links => $notexp, + }; + push(@devices, $device); + } + return \@devices; +} + +# This generator returns a suitable exp_func for use with +# all_block_devs(). +sub expect_for_some { + my ($pattern, $links, $donot) = @_; + my $_expect = sub { + my ($name) = @_; + + if ($name =~ /$pattern/) { + return ($links, undef); + } elsif ($donot) { + return (undef, $links); + } else { + return (undef, undef); + } + }; + return $_expect; +} + my @tests = ( { desc => "no rules", @@ -2257,6 +2301,15 @@ SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partitio KERNEL=="*7", OPTIONS+="link_priority=10" EOF }, + { + desc => 'all_block_devs', + generator => expect_for_some("\\/sda6\$", ["blockdev"]), + repeat => 10, + rules => <{devices}}; + my @devices; + + if (!defined $rules->{devices}) { + $rules->{devices} = all_block_devs($rules->{generator}); + } + @devices = @{$rules->{devices}}; print "TEST $number: $rules->{desc}\n"; create_rules(\$rules->{rules}); From 0ed1b64469c9d6caae65335d36c707efadebf1e9 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 25 Apr 2018 17:21:49 +0200 Subject: [PATCH 17/22] test/sd-script.py: new helper script for udev testing Script for generating LOTS of SCSI disk and partition devices in the fake sysfs we use for udev testing. This script is supposed to be run after sys-script.py. It uses code from sys-script.py as template to generate additional SCSI disk data structures. Together with the "generator" code in udev-test.pl added in the previous patch, it allows to run udev tests with almost arbitrarily many devices, and thus to do performance scaling tests. --- test/sd-script.py | 342 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 342 insertions(+) create mode 100644 test/sd-script.py diff --git a/test/sd-script.py b/test/sd-script.py new file mode 100644 index 0000000000..b41e3597cb --- /dev/null +++ b/test/sd-script.py @@ -0,0 +1,342 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: LGPL-2.1+ +# +# sd-script.py: create LOTS of sd device entries in fake sysfs +# +# (C) 2018 Martin Wilck, SUSE Linux GmbH +# +# Run after sys-script.py +# Usage: sd-script.py +# is the number of device nodes (disks + partititions) +# to create in addition to what sys-script.py already did. +# The script can be run several times in a row if is increased, +# adding yet more device entries. +# Tested up to 1000 entries, more are possible. +# Note that sys-script.py already creates 10 sd device nodes +# (sda+sdb and partitions). This script starts with sdc. + +import re +import os +import errno +import sys + +def d(path, mode): + os.mkdir(path, mode) + +def l(path, src): + os.symlink(src, path) + +def f(path, mode, contents): + with open(path, "wb") as f: + f.write(contents) + os.chmod(path, mode) + +class SD(object): + + sd_major = [8] + list(range(65, 72)) + list(range(128, 136)) + _name_re = re.compile(r'sd(?P[a-z]*)$') + + def _init_from_name(self, name): + mt = self._name_re.match(name) + if mt is None: + raise RuntimeError("invalid name %s" % name) + nm = mt.group("f") + base = 1 + ls = nm[-1] + nm = nm[:-1] + n = base * (ord(ls)-ord('a')) + while len(nm) > 0: + ls = nm[-1] + nm = nm[:-1] + base *= 26 + n += base * (1 + ord(ls)-ord('a')) + self._num = n + + def _init_from_dev(self, dev): + maj, min = dev.split(":") + maj = self.sd_major.index(int(maj, 10)) + min = int(min, 10) + num = int(min / 16) + self._num = 16*maj + num%16 + 256*int(num/16) + + @staticmethod + def _disk_num(a, b): + n = ord(a)-ord('a') + if b != '': + n = 26 * (n+1) + ord(b)-ord('a') + return n + + @staticmethod + def _get_major(n): + return SD.sd_major[(n%256)//16] + @staticmethod + def _get_minor(n): + return 16 * (n % 16 + 16 * n//256) + + @staticmethod + def _get_name(n): + # see sd_format_disk_name() (sd.c) + s = chr(n % 26 + ord('a')) + n = n // 26 - 1 + while n >= 0: + s = chr(n % 26 + ord('a')) + s + n = n // 26 - 1 + return "sd" + s + + @staticmethod + def _get_dev_t(n): + maj = SD._get_major(n) + min = SD._get_minor(n) + return (maj << 20) + min + + def __init__(self, arg): + if type(arg) is type(0): + self._num = arg + elif arg.startswith("sd"): + self._init_from_name(arg) + else: + self._init_from_dev(arg) + + def __cmp__(self, other): + return cmp(self._num, other._num) + + def __hash__(self): + return hash(self._num) + + def __str__(self): + return "%s/%s" % ( + self.devstr(), + self._get_name(self._num)) + + def major(self): + return self._get_major(self._num) + + def minor(self): + return self._get_minor(self._num) + + def devstr(self): + return "%d:%d" % (self._get_major(self._num), + self._get_minor(self._num)) + + def namestr(self): + return self._get_name(self._num) + + def longstr(self): + return "%d\t%s\t%s\t%08x" % (self._num, + self.devstr(), + self.namestr(), + self._get_dev_t(self._num)) + +class MySD(SD): + def subst(self, first_sg): + disk = { + "lun": self._num, + "major": self.major(), + "devnode": self.namestr(), + "disk_minor": self.minor(), + "sg_minor": first_sg + self._num, + } + return disk + +disk_template = r"""\ +l('sys/bus/scsi/drivers/sd/7:0:0:{lun}', '../../../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}') +l('sys/bus/scsi/devices/7:0:0:{lun}', '../../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}') +l('sys/dev/char/254:{sg_minor}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}') +l('sys/dev/char/21:{sg_minor}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}') +l('sys/class/scsi_disk/7:0:0:{lun}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}') +l('sys/class/scsi_generic/sg{sg_minor}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}') +l('sys/class/bsg/7:0:0:{lun}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}') +l('sys/class/scsi_device/7:0:0:{lun}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/generic', 'scsi_generic/sg{sg_minor}') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/subsystem', '../../../../../../../../../bus/scsi') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/driver', '../../../../../../../../../bus/scsi/drivers/sd') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/iodone_cnt', 0o644, b'0xc3\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/device_blocked', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/max_sectors', 0o644, b'240\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/modalias', 0o644, b'scsi:t-0x00\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_level', 0o644, b'3\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/queue_depth', 0o644, b'1\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/rev', 0o644, b'1.00\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/type', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/iocounterbits', 0o644, b'32\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/vendor', 0o644, b'Generic \n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/state', 0o644, b'running\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/queue_type', 0o644, b'none\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/iorequest_cnt', 0o644, b'0xc3\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/evt_media_change', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/model', 0o644, b'USB Flash Drive \n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/ioerr_cnt', 0o644, b'0x2\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/uevent', 0o644, b'''DEVTYPE=scsi_device +DRIVER=sd +MODALIAS=scsi:t-0x00 +''') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/timeout', 0o644, b'60\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk', 0o755) +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/subsystem', '../../../../../../../../../../../class/scsi_disk') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/device', '../../../7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/app_tag_own', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/FUA', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/cache_type', 0o644, b'write through\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/protection_type', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/manage_start_stop', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/allow_restart', 0o644, b'1\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/uevent', 0o644, b'') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_disk/7:0:0:{lun}/power/wakeup', 0o644, b'\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/power/wakeup', 0o644, b'\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic', 0o755) +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/subsystem', '../../../../../../../../../../../class/scsi_generic') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/device', '../../../7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/dev', 0o644, b'21:{sg_minor}\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/uevent', 0o644, b'''MAJOR=21 +MINOR={sg_minor} +''') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_generic/sg{sg_minor}/power/wakeup', 0o644, b'\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg', 0o755) +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/subsystem', '../../../../../../../../../../../class/bsg') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/device', '../../../7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/dev', 0o644, b'254:{sg_minor}\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/uevent', 0o644, b'''MAJOR=254 +MINOR={sg_minor} +''') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/bsg/7:0:0:{lun}/power/wakeup', 0o644, b'\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block', 0o755) +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device', 0o755) +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}/subsystem', '../../../../../../../../../../../class/scsi_device') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}/device', '../../../7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}/uevent', 0o644, b'') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/scsi_device/7:0:0:{lun}/power/wakeup', 0o644, b'\n') +l('sys/dev/block/{major}:{disk_minor}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}') +l('sys/class/block/{devnode}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}') +l('sys/block/{devnode}', '../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/subsystem', '../../../../../../../../../../../class/block') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/bdi', '../../../../../../../../../../virtual/bdi/{major}:{disk_minor}') +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/device', '../../../7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/capability', 0o644, b'13\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/ro', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/make-it-fail', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/size', 0o644, b'257024\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/dev', 0o644, b'{major}:{disk_minor}\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/range', 0o644, b'16\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/removable', 0o644, b'1\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/stat', 0o644, b' 117 409 2103 272 0 0 0 0 0 194 272\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/uevent', 0o644, b'''MAJOR={major} +MINOR={disk_minor} +DEVTYPE=disk +DEVNAME={devnode} +''') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/bsg', '../../../bsg/7:0:0:{lun}') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/nr_requests', 0o644, b'128\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/nomerges', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/scheduler', 0o644, b'noop anticipatory deadline [cfq] \n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/hw_sector_size', 0o644, b'512\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/max_hw_sectors_kb', 0o644, b'120\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/read_ahead_kb', 0o644, b'128\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/max_sectors_kb', 0o644, b'120\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/slice_async_rq', 0o644, b'2\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/back_seek_max', 0o644, b'16384\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/slice_sync', 0o644, b'100\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/slice_async', 0o644, b'40\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/fifo_expire_sync', 0o644, b'125\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/slice_idle', 0o644, b'8\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/back_seek_penalty', 0o644, b'2\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/fifo_expire_async', 0o644, b'250\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/queue/iosched/quantum', 0o644, b'4\n') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/power', 0o755) +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/power/wakeup', 0o644, b'\n') +""" + +part_template = r"""\ +l('sys/dev/block/{major}:{part_minor}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}') +l('sys/class/block/{devnode}{part_num}', '../../devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}') +d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}', 0o755) +l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/subsystem', '../../../../../../../../../../../../class/block') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/start', 0o644, b'32\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/make-it-fail', 0o644, b'0\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/size', 0o644, b'256992\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/dev', 0o644, b'{major}:{part_minor}\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/stat', 0o644, b' 109 392 1903 246 0 0 0 0 0 169 246\n') +f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:{lun}/block/{devnode}/{devnode}{part_num}/uevent', 0o644, b'''MAJOR={major} +MINOR={part_minor} +DEVTYPE=partition +DEVNAME={devnode}{part_num} +''') +""" + +if len(sys.argv) != 3: + exit("Usage: {} ".format(sys.argv[0])) + +if not os.path.isdir(sys.argv[1]): + exit("Target dir {} not found".format(sys.argv[1])) + +def create_part_sysfs(disk, sd, prt): + part = disk + part.update ({ + "part_num": prt, + "part_minor": disk["disk_minor"] + prt, + }) + + try: + exec(part_template.format(**part)) + except OSError: + si = sys.exc_info()[1] + if (si.errno == errno.EEXIST): + print("sysfs structures for %s%d exist" % (sd.namestr(), prt)) + else: + print("error for %s%d: %s" % (sd.namestr(), prt, si[1])) + raise + else: + print("sysfs structures for %s%d created" % (sd.namestr(), prt)) + +def create_disk_sysfs(dsk, first_sg, n): + sd = MySD(dsk) + disk = sd.subst(first_sg) + + try: + exec(disk_template.format(**disk)) + except OSError: + si = sys.exc_info()[1] + if (si.errno == errno.EEXIST): + print("sysfs structures for %s exist" % sd.namestr()) + elif (si.errno == errno.ENOENT): + print("error for %s: %s - have you run sys-script py first?" % + (sd.namestr(), si.strerror)) + return -1 + else: + print("error for %s: %s" % (sd.namestr(), si.strerror)) + raise + else: + print("sysfs structures for %s created" % sd.namestr()) + + n += 1 + if n >= last: + return n + + for prt in range(1, 16): + create_part_sysfs(disk, sd, prt) + n += 1 + if n >= last: + return n + + return n + +os.chdir(sys.argv[1]) +n = 0 +last = int(sys.argv[2]) +first_sg = 2 +for dsk in range(2, 1000): + n = create_disk_sysfs(dsk, first_sg, n) + if n >= last or n == -1: + break From f1cb0860549e775be5f91237b5a3b97698dd14dd Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 26 Apr 2018 13:25:11 +0200 Subject: [PATCH 18/22] test/udev-test.pl: suppress umount error message at startup umount emits an error message "no mount point specified" if the tmpfs isn't mounted yet, which is the normal case. Suppress that by redirecting stderr. --- test/udev-test.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 790387e680..5e362db6c5 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2405,7 +2405,7 @@ sub major_minor_test { } sub udev_setup { - system("umount", $udev_tmpfs); + system("umount \"$udev_tmpfs\" 2>/dev/null"); rmdir($udev_tmpfs); mkdir($udev_tmpfs) || die "unable to create udev_tmpfs: $udev_tmpfs\n"; From cbeb23d863d540408cd1fb274d78213f59639df2 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 26 Apr 2018 14:07:27 +0200 Subject: [PATCH 19/22] test/udev_test.pl: add "expected good" count Since 'test/udev-test.pl: count "good" results', we know how many checks succeeded. Add an "expected good" count to make that number more meaningful. --- test/udev-test.pl | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 5e362db6c5..693b0d84c7 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2338,6 +2338,7 @@ sub udev { my $error = 0; my $good = 0; +my $exp_good = 0; sub permissions_test { my($rules, $uid, $gid, $mode) = @_; @@ -2685,12 +2686,27 @@ sub run_test { my ($rules, $number, $sema) = @_; my $rc; my @devices; + my $ntests; + my $cur_good = $good; + my $cur_error = $error; if (!defined $rules->{devices}) { $rules->{devices} = all_block_devs($rules->{generator}); } @devices = @{$rules->{devices}}; + # For each device: exit status and devnode test for add & remove + $ntests += 4 * ($#devices + 1); + foreach my $dev (@devices) { + $ntests += 2 * ($#{$dev->{exp_links}} + 1) + + ($#{$dev->{not_exp_links}} + 1) + + (defined $dev->{exp_perms} ? 1 : 0) + + (defined $dev->{exp_majorminor} ? 1 : 0); + } + if (defined $rules->{repeat}) { + $ntests *= $rules->{repeat}; + } + $exp_good += $ntests; print "TEST $number: $rules->{desc}\n"; create_rules(\$rules->{rules}); @@ -2712,10 +2728,11 @@ sub run_test { check_remove($dev); } - print "\n"; if (defined($rules->{repeat}) && --($rules->{repeat}) > 0) { goto REPEAT; } + printf "TEST $number: errors: %d good: %d/%d\n\n", $error-$cur_error, + $good-$cur_good, $ntests; if (defined($rules->{option}) && $rules->{option} eq "clean") { udev_setup(); @@ -2794,7 +2811,7 @@ if ($list[0]) { } $sema->remove; -print "$error errors occurred. $good good results.\n\n"; +print "$error errors occurred. $good/$exp_good good results.\n\n"; cleanup(); From dec8e6cfb479eee3fa53195218c0eb744fde5e72 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 24 Apr 2018 21:40:23 +0200 Subject: [PATCH 20/22] test/sys-script.py: add missing DEVNAME entries to uevents --- test/sys-script.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/sys-script.py b/test/sys-script.py index a51112603e..f4a847e356 100755 --- a/test/sys-script.py +++ b/test/sys-script.py @@ -11677,6 +11677,7 @@ f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0: f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/uevent', 0o644, b'''MAJOR=8 MINOR=16 DEVTYPE=disk +DEVNAME=sdb ''') d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/queue', 0o755) l('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/queue/bsg', '../../../bsg/7:0:0:0') @@ -11709,6 +11710,7 @@ f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0: f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/sdb1/uevent', 0o644, b'''MAJOR=8 MINOR=17 DEVTYPE=partition +DEVNAME=sdb1 ''') d('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/sdb1/power', 0o755) f('sys/devices/pci0000:00/0000:00:1d.7/usb5/5-1/5-1:1.0/host7/target7:0:0/7:0:0:0/block/sdb/sdb1/power/wakeup', 0o644, b'\n') @@ -13150,6 +13152,7 @@ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10 f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10/uevent', 0o644, b'''MAJOR=8 MINOR=10 DEVTYPE=partition +DEVNAME=sda10 ''') d('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10/power', 0o755) f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10/power/wakeup', 0o644, b'\n') @@ -13163,6 +13166,7 @@ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9/ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9/uevent', 0o644, b'''MAJOR=8 MINOR=9 DEVTYPE=partition +DEVNAME=sda9 ''') d('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9/holders', 0o755) l('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9/holders/md0', '../../../../../../../../../virtual/block/md0') @@ -13178,6 +13182,7 @@ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7/ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7/uevent', 0o644, b'''MAJOR=8 MINOR=7 DEVTYPE=partition +DEVNAME=sda7 ''') d('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7/power', 0o755) f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7/power/wakeup', 0o644, b'\n') @@ -13205,6 +13210,7 @@ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8/ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8/uevent', 0o644, b'''MAJOR=8 MINOR=8 DEVTYPE=partition +DEVNAME=sda8 ''') d('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8/power', 0o755) f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8/power/wakeup', 0o644, b'\n') @@ -13232,6 +13238,7 @@ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6/ f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6/uevent', 0o644, b'''MAJOR=8 MINOR=6 DEVTYPE=partition +DEVNAME=sda6 ''') d('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6/power', 0o755) f('sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6/power/wakeup', 0o644, b'\n') From a59b0a9f768f6e27b25f4f1bab6de08842e78d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Sekleta=CC=81r?= Date: Thu, 5 Nov 2020 17:55:25 +0100 Subject: [PATCH 21/22] basic/stat-util: make mtime check stricter and use entire timestamp Note that st_mtime member of struct stat is defined as follows, #define st_mtime st_mtim.tv_sec Hence we omitted checking nanosecond part of the timestamp (struct timespec) and possibly would miss modifications that happened within the same second. --- src/basic/stat-util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c index 574815bc43..6c431410cd 100644 --- a/src/basic/stat-util.c +++ b/src/basic/stat-util.c @@ -408,7 +408,8 @@ bool stat_inode_unmodified(const struct stat *a, const struct stat *b) { return a && b && (a->st_mode & S_IFMT) != 0 && /* We use the check for .st_mode if the structure was ever initialized */ ((a->st_mode ^ b->st_mode) & S_IFMT) == 0 && /* same inode type */ - a->st_mtime == b->st_mtime && + a->st_mtim.tv_sec == b->st_mtim.tv_sec && + a->st_mtim.tv_nsec == b->st_mtim.tv_nsec && (!S_ISREG(a->st_mode) || a->st_size == b->st_size) && /* if regular file, compare file size */ a->st_dev == b->st_dev && a->st_ino == b->st_ino && From 30f6dce62cb3a738b20253f2192270607c31b55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Sekleta=CC=81r?= Date: Fri, 23 Oct 2020 16:30:23 +0200 Subject: [PATCH 22/22] udev: make algorithm that selects highest priority devlink less susceptible to race conditions Previously it was very likely, when multiple contenders for the symlink appear in parallel, that algorithm would select wrong symlink (i.e. one with lower-priority). Now the algorithm is much more defensive and when we detect change in set of contenders for the symlink we reevaluate the selection. Same happens when new symlink replaces already existing symlink that points to different device node. --- src/udev/udev-event.c | 7 ++++ src/udev/udev-node.c | 75 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 67 insertions(+), 15 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index ede8e3aef7..87ae30cfa3 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -1041,6 +1041,13 @@ int udev_event_execute_rules(UdevEvent *event, if (r < 0) return log_device_debug_errno(dev, r, "Failed to update database under /run/udev/data/: %m"); + /* Yes, we run update_devnode() twice, because in the first invocation, that is before update of udev database, + * it could happen that two contenders are replacing each other's symlink. Hence we run it again to make sure + * symlinks point to devices that claim them with the highest priority. */ + r = update_devnode(event); + if (r < 0) + return r; + device_set_is_initialized(dev); return 0; diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 2cc26d29fa..de05556686 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -20,12 +20,15 @@ #include "path-util.h" #include "selinux-util.h" #include "smack-util.h" +#include "stat-util.h" #include "stdio-util.h" #include "string-util.h" #include "strxcpyx.h" #include "udev-node.h" #include "user-util.h" +#define LINK_UPDATE_MAX_RETRIES 128 + static int node_symlink(sd_device *dev, const char *node, const char *slink) { _cleanup_free_ char *slink_dirname = NULL, *target = NULL; const char *id_filename, *slink_tmp; @@ -99,7 +102,9 @@ static int node_symlink(sd_device *dev, const char *node, const char *slink) { if (rename(slink_tmp, slink) < 0) { r = log_device_error_errno(dev, errno, "Failed to rename '%s' to '%s': %m", slink_tmp, slink); (void) unlink(slink_tmp); - } + } else + /* Tell caller that we replaced already existing symlink. */ + r = 1; return r; } @@ -192,7 +197,7 @@ static int link_update(sd_device *dev, const char *slink, bool add) { _cleanup_free_ char *target = NULL, *filename = NULL, *dirname = NULL; char name_enc[PATH_MAX]; const char *id_filename; - int r; + int i, r, retries; assert(dev); assert(slink); @@ -212,14 +217,6 @@ static int link_update(sd_device *dev, const char *slink, bool add) { if (!add && unlink(filename) == 0) (void) rmdir(dirname); - r = link_find_prioritized(dev, add, dirname, &target); - if (r < 0) { - log_device_debug(dev, "No reference left, removing '%s'", slink); - if (unlink(slink) == 0) - (void) rmdir_parents(slink, "/"); - } else - (void) node_symlink(dev, target, slink); - if (add) do { _cleanup_close_ int fd = -1; @@ -232,7 +229,49 @@ static int link_update(sd_device *dev, const char *slink, bool add) { r = -errno; } while (r == -ENOENT); - return r; + /* If the database entry is not written yet we will just do one iteration and possibly wrong symlink + * will be fixed in the second invocation. */ + retries = sd_device_get_is_initialized(dev) > 0 ? LINK_UPDATE_MAX_RETRIES : 1; + + for (i = 0; i < retries; i++) { + struct stat st1 = {}, st2 = {}; + + r = stat(dirname, &st1); + if (r < 0 && errno != ENOENT) + return -errno; + + r = link_find_prioritized(dev, add, dirname, &target); + if (r == -ENOENT) { + log_device_debug(dev, "No reference left, removing '%s'", slink); + if (unlink(slink) == 0) + (void) rmdir_parents(slink, "/"); + + break; + } else if (r < 0) + return log_device_error_errno(dev, r, "Failed to determine highest priority symlink: %m"); + + r = node_symlink(dev, target, slink); + if (r < 0) { + (void) unlink(filename); + break; + } else if (r == 1) + /* We have replaced already existing symlink, possibly there is some other device trying + * to claim the same symlink. Let's do one more iteration to give us a chance to fix + * the error if other device actually claims the symlink with higher priority. */ + continue; + + /* Skip the second stat() if the first failed, stat_inode_unmodified() would return false regardless. */ + if ((st1.st_mode & S_IFMT) != 0) { + r = stat(dirname, &st2); + if (r < 0 && errno != ENOENT) + return -errno; + + if (stat_inode_unmodified(&st1, &st2)) + break; + } + } + + return i < LINK_UPDATE_MAX_RETRIES ? 0 : -ELOOP; } int udev_node_update_old_links(sd_device *dev, sd_device *dev_old) { @@ -451,8 +490,11 @@ int udev_node_add(sd_device *dev, bool apply, (void) node_symlink(dev, devnode, filename); /* create/update symlinks, add symlinks to name index */ - FOREACH_DEVICE_DEVLINK(dev, devlink) - (void) link_update(dev, devlink, true); + FOREACH_DEVICE_DEVLINK(dev, devlink) { + r = link_update(dev, devlink, true); + if (r < 0) + log_device_info_errno(dev, r, "Failed to update device symlinks: %m"); + } return 0; } @@ -465,8 +507,11 @@ int udev_node_remove(sd_device *dev) { assert(dev); /* remove/update symlinks, remove symlinks from name index */ - FOREACH_DEVICE_DEVLINK(dev, devlink) - (void) link_update(dev, devlink, false); + FOREACH_DEVICE_DEVLINK(dev, devlink) { + r = link_update(dev, devlink, false); + if (r < 0) + log_device_info_errno(dev, r, "Failed to update device symlinks: %m"); + } r = xsprintf_dev_num_path_from_sd_device(dev, &filename); if (r < 0)