X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=wait_for_sysfs.c;h=25a3fb4eef9bcf4279a5f07e5c4c4770ca2461ca;hp=b9efcddf8798e8b071231ea316aba0333fe18aee;hb=396bb4c3d33dfd68c5817da5e03251fbd82e2713;hpb=a8b5267a629f21c30d4e94ec82be193009803ddd diff --git a/wait_for_sysfs.c b/wait_for_sysfs.c index b9efcddf8..25a3fb4ee 100644 --- a/wait_for_sysfs.c +++ b/wait_for_sysfs.c @@ -1,7 +1,7 @@ /* * wait_for_sysfs.c - small program to delay the execution * of /etc/hotplug.d/ programs, until sysfs - * is populated by the kernel. Depending on + * is fully populated by the kernel. Depending on * the type of device, we wait for all expected * directories and then just exit. * @@ -32,6 +32,7 @@ #include #include "logging.h" +#include "udev_version.h" #include "libsysfs/sysfs/libsysfs.h" #ifdef LOG @@ -46,9 +47,10 @@ void log_message(int level, const char *format, ...) } #endif -#define WAIT_MAX_SECONDS 5 +#define WAIT_MAX_SECONDS 10 #define WAIT_LOOP_PER_SECOND 20 +/* wait for specific file to show up, normally the "dev"-file */ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev) { static struct class_file { @@ -56,8 +58,17 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev char *file; } class_files[] = { { .subsystem = "net", .file = "ifindex" }, + { .subsystem = "scsi_host", .file = "unique_id" }, + { .subsystem = "scsi_device", .file = NULL }, + { .subsystem = "pcmcia_socket", .file = NULL }, /* all files are unreadable in empty slot :( */ { .subsystem = "usb_host", .file = NULL }, - { .subsystem = "pcmcia_socket", .file = NULL }, + { .subsystem = "bluetooth", .file = "address" }, + { .subsystem = "firmware", .file = "data" }, + { .subsystem = "i2c-adapter", .file = NULL }, + { .subsystem = "pci_bus", .file = NULL }, + { .subsystem = "ieee1394", .file = NULL }, + { .subsystem = "ieee1394_host", .file = NULL }, + { .subsystem = "ieee1394_node", .file = NULL }, { NULL, NULL } }; struct class_file *classfile; @@ -83,63 +94,121 @@ static int wait_for_class_device_attributes(struct sysfs_class_device *class_dev dbg("class '%s' specific file '%s' found", class_dev->classname, file); return 0; } + + usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); } - dbg("error: getting bus '%s' specific file '%s'", class_dev->classname, file); + dbg("error: getting class '%s' specific file '%s'", class_dev->classname, file); return -1; } +/* check if we need to wait for a physical device */ static int class_device_expect_no_device_link(struct sysfs_class_device *class_dev) { - char **device; + /* list of devices without a "device" symlink to the physical device + * if device is set to NULL, no devices in that subsystem has a link */ + static struct class_device { + char *subsystem; + char *device; + } class_device[] = { + { .subsystem = "block", .device = "double" }, + { .subsystem = "block", .device = "nb" }, + { .subsystem = "block", .device = "ram" }, + { .subsystem = "block", .device = "loop" }, + { .subsystem = "block", .device = "fd" }, + { .subsystem = "block", .device = "md" }, + { .subsystem = "block", .device = "dos_cd" }, + { .subsystem = "block", .device = "rflash" }, + { .subsystem = "block", .device = "rom" }, + { .subsystem = "block", .device = "rrom" }, + { .subsystem = "block", .device = "flash" }, + { .subsystem = "block", .device = "msd" }, + { .subsystem = "block", .device = "sbpcd" }, + { .subsystem = "block", .device = "pcd" }, + { .subsystem = "block", .device = "pf" }, + { .subsystem = "block", .device = "scd" }, + { .subsystem = "block", .device = "ubd" }, + { .subsystem = "input", .device = "event" }, + { .subsystem = "input", .device = "mice" }, + { .subsystem = "input", .device = "mouse" }, + { .subsystem = "input", .device = "ts" }, + { .subsystem = "vc", .device = NULL }, + { .subsystem = "tty", .device = NULL }, + { .subsystem = "cpuid", .device = "cpu" }, + { .subsystem = "graphics", .device = "fb" }, + { .subsystem = "mem", .device = NULL }, + { .subsystem = "misc", .device = NULL }, + { .subsystem = "msr", .device = NULL }, + { .subsystem = "netlink", .device = NULL }, + { .subsystem = "net", .device = "sit" }, + { .subsystem = "net", .device = "ppp" }, + { .subsystem = "net", .device = "lo" }, + { .subsystem = "net", .device = "tap" }, + { .subsystem = "net", .device = "ipsec" }, + { .subsystem = "net", .device = "irda" }, + { .subsystem = "sound", .device = NULL }, + { .subsystem = "printer", .device = "lp" }, + { .subsystem = "nvidia", .device = NULL }, + { .subsystem = "video4linux", .device = "vbi" }, + { .subsystem = "lirc", .device = NULL }, + { .subsystem = "firmware", .device = NULL }, + { .subsystem = "drm", .device = NULL }, + { .subsystem = "pci_bus", .device = NULL }, + { .subsystem = "ieee1394", .device = NULL }, + { .subsystem = "ieee1394_host", .device = NULL }, + { .subsystem = "ieee1394_node", .device = NULL }, + { .subsystem = "raw", .device = NULL }, + { NULL, NULL } + }; + struct class_device *classdevice; + int len; - static char *devices_without_link[] = { - "nb", - "ram", - "loop", - "fd", - "md", - "dos_cd", - "double", - "flash", - "msd", - "rflash", - "rom", - "rrom", - "sbpcd", - "pcd", - "pf", - "scd", - "sit", - "lp", - "ubd", - "vcs", - "vcsa", - "console", - "tty", - "ttyS", + for (classdevice = class_device; classdevice->subsystem != NULL; classdevice++) { + if (strcmp(class_dev->classname, classdevice->subsystem) == 0) { + /* see if no device in this class is expected to have a device-link */ + if (classdevice->device == NULL) + return 1; + + len = strlen(classdevice->device); + + /* see if device name matches */ + if (strncmp(class_dev->name, classdevice->device, len) != 0) + continue; + + /* exact name match */ + if (strlen(class_dev->name) == len) + return 1; + + /* name match with instance number */ + if (isdigit(class_dev->name[len])) + return 1; + } + } + + return 0; +} + +/* skip waiting for the bus */ +static int class_device_expect_no_bus(struct sysfs_class_device *class_dev) +{ + static char *devices_without_bus[] = { + "scsi_host", + "i2c-adapter", NULL }; + char **device; - for (device = devices_without_link; *device != NULL; device++) { + for (device = devices_without_bus; *device != NULL; device++) { int len = strlen(*device); - /* look if name matches */ - if (strncmp(class_dev->name, *device, len) != 0) - continue; - - /* exact match */ - if (strlen(class_dev->name) == len) - return 1; - - /* instance numbers are matching too */ - if (isdigit(class_dev->name[len])) + if (strncmp(class_dev->classname, *device, len) == 0) return 1; } return 0; } +/* wait for the bus and for a bus specific file to show up */ static int wait_for_bus_device(struct sysfs_device *device_dev) { static struct bus_file { @@ -149,9 +218,12 @@ static int wait_for_bus_device(struct sysfs_device *device_dev) { .bus = "scsi", .file = "vendor" }, { .bus = "usb", .file = "idVendor" }, { .bus = "usb", .file = "iInterface" }, + { .bus = "usb", .file = "bNumEndpoints" }, { .bus = "usb-serial", .file = "detach_state" }, { .bus = "ide", .file = "detach_state" }, { .bus = "pci", .file = "vendor" }, + { .bus = "platform", .file = "detach_state" }, + { .bus = "i2c", .file = "detach_state" }, { NULL } }; struct bus_file *busfile; @@ -174,19 +246,24 @@ static int wait_for_bus_device(struct sysfs_device *device_dev) /* wait for a bus specific file to show up */ loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND; while (--loop) { + int found = 0; + for (busfile = bus_files; busfile->bus != NULL; busfile++) { if (strcmp(device_dev->bus, busfile->bus) == 0) { + found = 1; dbg("looking at bus '%s' for specific file '%s'", device_dev->bus, busfile->file); if (sysfs_get_device_attr(device_dev, busfile->file) != NULL) { dbg("bus '%s' specific file '%s' found", device_dev->bus, busfile->file); return 0; } - if (busfile->bus == NULL) { - info("error: unknown bus, update the build-in list '%s'", device_dev->bus); - return -1; - } } } + if (found == 0) { + info("error: unknown bus, please report to " + " '%s'", device_dev->bus); + return -1; + } + usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); } dbg("error: getting bus '%s' specific file '%s'", device_dev->bus, busfile->file); @@ -206,6 +283,8 @@ int main(int argc, char *argv[], char *envp[]) int loop; int rc = 0; + init_logging("wait_for_sysfs"); + if (argc != 2) { dbg("error: subsystem"); return 1; @@ -224,6 +303,7 @@ int main(int argc, char *argv[], char *envp[]) return 1; } + /* we only wait on an add event */ if (strcmp(action, "add") != 0) return 0; @@ -242,20 +322,25 @@ int main(int argc, char *argv[], char *envp[]) class_dev = sysfs_open_class_device_path(filename); if (class_dev) break; + + usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); } if (class_dev == NULL) { dbg("error: getting class_device"); - rc = 4; + rc = 3; goto exit; } dbg("class_device opened '%s'", filename); - wait_for_class_device_attributes(class_dev); + if (wait_for_class_device_attributes(class_dev) != 0) { + rc = 4; + goto exit_class; + } + /* skip devices without /device-link */ if (class_device_expect_no_device_link(class_dev)) { - dbg("no device symlink expected"); - sysfs_close_class_device(class_dev); - goto exit; + dbg("no device symlink expected for '%s', ", class_dev->name); + goto exit_class; } /* the symlink may be on the parent device */ @@ -279,19 +364,21 @@ int main(int argc, char *argv[], char *envp[]) } if (device_dev == NULL) { dbg("error: getting /device-device"); - sysfs_close_class_device(class_dev); rc = 5; - goto exit; + goto exit_class; } dbg("device symlink found pointing to '%s'", device_dev->path); /* wait for the bus value */ - if (wait_for_bus_device(device_dev) != 0) - rc = 6; - sysfs_close_class_device(class_dev); + if (class_device_expect_no_bus(class_dev)) { + dbg("no bus device expected for '%s', ", class_dev->classname); + } else { + if (wait_for_bus_device(device_dev) != 0) + rc = 6; + } - /* finished */ - goto exit; +exit_class: + sysfs_close_class_device(class_dev); } else if ((strncmp(devpath, "/devices/", 9) == 0)) { /* open the path we are called for */ @@ -303,32 +390,34 @@ int main(int argc, char *argv[], char *envp[]) device_dev = sysfs_open_device_path(filename); if (device_dev) break; + + usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND); } if (device_dev == NULL) { dbg("error: getting /device-device"); - rc = 4; + rc = 7; goto exit; } dbg("device_device opened '%s'", filename); /* wait for the bus value */ if (wait_for_bus_device(device_dev) != 0) - rc = 9; + rc = 8; sysfs_close_device(device_dev); - /* finished */ - goto exit; - } else { dbg("unhandled sysfs path, no need to wait"); } exit: if (rc == 0) - info("result: waiting for sysfs successful '%s'", devpath); + dbg("result: waiting for sysfs successful '%s'", devpath); else - info("result: waiting for sysfs failed '%s'", devpath); + info("either wait_for_sysfs (udev %s) needs an update to handle the device '%s' " + "properly (%d) or the sysfs-support of your device's driver needs to be fixed, " + "please report to ", + UDEV_VERSION, devpath, rc); return rc; }