X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=8922ff9f8e3bcf134bb32a8a5214cadf09489910;hp=819ea3bb22ad0198292c5ef05b779a0ebaa4aa05;hb=959d654105c1303d0c475868a51834db2f7b6099;hpb=3d06f4183470d42361303086ed9dedd29c0ffc1b diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 819ea3bb2..8922ff9f8 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -46,17 +47,16 @@ #include #include "udev.h" +#include "udev-util.h" +#include "rtnl-util.h" #include "sd-daemon.h" #include "cgroup-util.h" #include "dev-setup.h" #include "fileio.h" -static bool debug; - void udev_main_log(struct udev *udev, int priority, const char *file, int line, const char *fn, - const char *format, va_list args) -{ + const char *format, va_list args) { log_metav(priority, file, line, fn, format, args); } @@ -70,8 +70,13 @@ static int fd_inotify = -1; static bool stop_exec_queue; static bool reload; static int children; -static int children_max; -static int exec_delay; +static bool arg_debug = false; +static int arg_daemonize = false; +static int arg_resolve_names = 1; +static int arg_children_max; +static int arg_exec_delay; +static usec_t arg_event_timeout_usec = 180 * USEC_PER_SEC; +static usec_t arg_event_timeout_warn_usec = 180 * USEC_PER_SEC / 3; static sigset_t sigmask_orig; static UDEV_LIST(event_list); static UDEV_LIST(worker_list); @@ -98,13 +103,9 @@ struct event { dev_t devnum; int ifindex; bool is_block; -#ifdef HAVE_FIRMWARE - bool nodelay; -#endif }; -static inline struct event *node_to_event(struct udev_list_node *node) -{ +static inline struct event *node_to_event(struct udev_list_node *node) { return container_of(node, struct event, node); } @@ -126,6 +127,7 @@ struct worker { enum worker_state state; struct event *event; usec_t event_start_usec; + bool event_warned; }; /* passed from worker to main process */ @@ -134,34 +136,29 @@ struct worker_message { int exitcode; }; -static inline struct worker *node_to_worker(struct udev_list_node *node) -{ +static inline struct worker *node_to_worker(struct udev_list_node *node) { return container_of(node, struct worker, node); } -static void event_queue_delete(struct event *event) -{ +static void event_queue_delete(struct event *event) { udev_list_node_remove(&event->node); udev_device_unref(event->dev); free(event); } -static struct worker *worker_ref(struct worker *worker) -{ +static struct worker *worker_ref(struct worker *worker) { worker->refcount++; return worker; } -static void worker_cleanup(struct worker *worker) -{ +static void worker_cleanup(struct worker *worker) { udev_list_node_remove(&worker->node); udev_monitor_unref(worker->monitor); children--; free(worker); } -static void worker_unref(struct worker *worker) -{ +static void worker_unref(struct worker *worker) { worker->refcount--; if (worker->refcount > 0) return; @@ -169,8 +166,7 @@ static void worker_unref(struct worker *worker) worker_cleanup(worker); } -static void worker_list_cleanup(struct udev *udev) -{ +static void worker_list_cleanup(struct udev *udev) { struct udev_list_node *loop, *tmp; udev_list_node_foreach_safe(loop, tmp, &worker_list) { @@ -180,8 +176,7 @@ static void worker_list_cleanup(struct udev *udev) } } -static void worker_new(struct event *event) -{ +static void worker_new(struct event *event) { struct udev *udev = event->udev; struct worker *worker; struct udev_monitor *worker_monitor; @@ -209,6 +204,7 @@ static void worker_new(struct event *event) case 0: { struct udev_device *dev = NULL; int fd_monitor; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; struct epoll_event ep_signal, ep_monitor; sigset_t mask; int rc = EXIT_SUCCESS; @@ -279,18 +275,21 @@ static void worker_new(struct event *event) /* needed for SIGCHLD/SIGTERM in spawn() */ udev_event->fd_signal = fd_signal; - if (exec_delay > 0) - udev_event->exec_delay = exec_delay; + if (arg_exec_delay > 0) + udev_event->exec_delay = arg_exec_delay; /* - * Take a "read lock" on the device node; this establishes + * Take a shared lock on the device node; this establishes * a concept of device "ownership" to serialize device - * access. External processes holding a "write lock" will + * access. External processes holding an exclusive lock will * cause udev to skip the event handling; in the case udev - * acquired the lock, the external process will block until + * acquired the lock, the external process can block until * udev has finished its event handling. */ - if (streq_ptr("block", udev_device_get_subsystem(dev))) { + if (!streq_ptr(udev_device_get_action(dev), "remove") && + streq_ptr("block", udev_device_get_subsystem(dev)) && + !startswith(udev_device_get_sysname(dev), "dm-") && + !startswith(udev_device_get_sysname(dev), "md")) { struct udev_device *d = dev; if (streq_ptr("partition", udev_device_get_devtype(d))) @@ -307,10 +306,16 @@ static void worker_new(struct event *event) } } + /* needed for renaming netifs */ + udev_event->rtnl = rtnl; + /* apply rules, create node, symlinks */ - udev_event_execute_rules(udev_event, rules, &sigmask_orig); + udev_event_execute_rules(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, rules, &sigmask_orig); - udev_event_execute_run(udev_event, &sigmask_orig); + udev_event_execute_run(udev_event, arg_event_timeout_usec, arg_event_timeout_warn_usec, &sigmask_orig); + + /* in case rtnl was initialized */ + rtnl = sd_rtnl_ref(udev_event->rtnl); /* apply/restore inotify watch */ if (udev_event->inotify_watch) { @@ -401,6 +406,7 @@ out: worker->pid = pid; worker->state = WORKER_RUNNING; worker->event_start_usec = now(CLOCK_MONOTONIC); + worker->event_warned = false; worker->event = event; event->state = EVENT_RUNNING; udev_list_node_append(&worker->node, &worker_list); @@ -410,8 +416,7 @@ out: } } -static void event_run(struct event *event) -{ +static void event_run(struct event *event) { struct udev_list_node *loop; udev_list_node_foreach(loop, &worker_list) { @@ -432,12 +437,13 @@ static void event_run(struct event *event) worker->event = event; worker->state = WORKER_RUNNING; worker->event_start_usec = now(CLOCK_MONOTONIC); + worker->event_warned = false; event->state = EVENT_RUNNING; return; } - if (children >= children_max) { - if (children_max > 1) + if (children >= arg_children_max) { + if (arg_children_max > 1) log_debug("maximum number (%i) of children reached", children); return; } @@ -446,8 +452,7 @@ static void event_run(struct event *event) worker_new(event); } -static int event_queue_insert(struct udev_device *dev) -{ +static int event_queue_insert(struct udev_device *dev) { struct event *event; event = new0(struct event, 1); @@ -463,10 +468,6 @@ static int event_queue_insert(struct udev_device *dev) event->devnum = udev_device_get_devnum(dev); event->is_block = streq("block", udev_device_get_subsystem(dev)); event->ifindex = udev_device_get_ifindex(dev); -#ifdef HAVE_FIRMWARE - if (streq(udev_device_get_subsystem(dev), "firmware")) - event->nodelay = true; -#endif log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev), udev_device_get_action(dev), udev_device_get_subsystem(dev)); @@ -476,8 +477,7 @@ static int event_queue_insert(struct udev_device *dev) return 0; } -static void worker_kill(struct udev *udev) -{ +static void worker_kill(struct udev *udev) { struct udev_list_node *loop; udev_list_node_foreach(loop, &worker_list) { @@ -492,8 +492,7 @@ static void worker_kill(struct udev *udev) } /* lookup event for identical, parent, child device */ -static bool is_devpath_busy(struct event *event) -{ +static bool is_devpath_busy(struct event *event) { struct udev_list_node *loop; size_t common; @@ -545,12 +544,6 @@ static bool is_devpath_busy(struct event *event) return true; } -#ifdef HAVE_FIRMWARE - /* allow to bypass the dependency tracking */ - if (event->nodelay) - continue; -#endif - /* parent device event found */ if (event->devpath[common] == '/') { event->delaying_seqnum = loop_event->seqnum; @@ -570,8 +563,7 @@ static bool is_devpath_busy(struct event *event) return false; } -static void event_queue_start(struct udev *udev) -{ +static void event_queue_start(struct udev *udev) { struct udev_list_node *loop; udev_list_node_foreach(loop, &event_list) { @@ -588,8 +580,7 @@ static void event_queue_start(struct udev *udev) } } -static void event_queue_cleanup(struct udev *udev, enum event_state match_type) -{ +static void event_queue_cleanup(struct udev *udev, enum event_state match_type) { struct udev_list_node *loop, *tmp; udev_list_node_foreach_safe(loop, tmp, &event_list) { @@ -602,8 +593,7 @@ static void event_queue_cleanup(struct udev *udev, enum event_state match_type) } } -static void worker_returned(int fd_worker) -{ +static void worker_returned(int fd_worker) { for (;;) { struct worker_message msg; ssize_t size; @@ -635,8 +625,7 @@ static void worker_returned(int fd_worker) } /* receive the udevd message from userspace */ -static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) -{ +static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) { struct udev *udev = udev_ctrl_get_udev(uctrl); struct udev_ctrl_connection *ctrl_conn; struct udev_ctrl_msg *ctrl_msg = NULL; @@ -704,7 +693,7 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) i = udev_ctrl_get_set_children_max(ctrl_msg); if (i >= 0) { log_debug("udevd message (SET_MAX_CHILDREN) received, children_max=%i", i); - children_max = i; + arg_children_max = i; } if (udev_ctrl_get_ping(ctrl_msg) > 0) @@ -721,20 +710,124 @@ out: return udev_ctrl_connection_unref(ctrl_conn); } -/* read inotify messages */ -static int handle_inotify(struct udev *udev) -{ +static int synthesize_change(struct udev_device *dev) { + char filename[UTIL_PATH_SIZE]; + int r; + + if (streq_ptr("block", udev_device_get_subsystem(dev)) && + streq_ptr("disk", udev_device_get_devtype(dev)) && + !startswith(udev_device_get_sysname(dev), "dm-")) { + bool part_table_read = false; + bool has_partitions = false; + int fd; + struct udev *udev = udev_device_get_udev(dev); + _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; + struct udev_list_entry *item; + + /* + * Try to re-read the partition table. This only succeeds if + * none of the devices is busy. The kernel returns 0 if no + * partition table is found, and we will not get an event for + * the disk. + */ + fd = open(udev_device_get_devnode(dev), O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK); + if (fd >= 0) { + r = flock(fd, LOCK_EX|LOCK_NB); + if (r >= 0) + r = ioctl(fd, BLKRRPART, 0); + + close(fd); + if (r >= 0) + part_table_read = true; + } + + /* search for partitions */ + e = udev_enumerate_new(udev); + if (!e) + return -ENOMEM; + + r = udev_enumerate_add_match_parent(e, dev); + if (r < 0) + return r; + + r = udev_enumerate_add_match_subsystem(e, "block"); + if (r < 0) + return r; + + r = udev_enumerate_scan_devices(e); + if (r < 0) + return r; + + udev_list_entry_foreach(item, udev_enumerate_get_list_entry(e)) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + + d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)); + if (!d) + continue; + + if (!streq_ptr("partition", udev_device_get_devtype(d))) + continue; + + has_partitions = true; + break; + } + + /* + * We have partitions and re-read the table, the kernel already sent + * out a "change" event for the disk, and "remove/add" for all + * partitions. + */ + if (part_table_read && has_partitions) + return 0; + + /* + * We have partitions but re-reading the partition table did not + * work, synthesize "change" for the disk and all partitions. + */ + log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev)); + strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL); + write_string_file(filename, "change"); + + udev_list_entry_foreach(item, udev_enumerate_get_list_entry(e)) { + _cleanup_udev_device_unref_ struct udev_device *d = NULL; + + d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item)); + if (!d) + continue; + + if (!streq_ptr("partition", udev_device_get_devtype(d))) + continue; + + log_debug("device %s closed, synthesising partition '%s' 'change'", + udev_device_get_devnode(dev), udev_device_get_devnode(d)); + strscpyl(filename, sizeof(filename), udev_device_get_syspath(d), "/uevent", NULL); + write_string_file(filename, "change"); + } + + return 0; + } + + log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev)); + strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL); + write_string_file(filename, "change"); + + return 0; +} + +static int handle_inotify(struct udev *udev) { int nbytes, pos; char *buf; struct inotify_event *ev; + int r; - if ((ioctl(fd_inotify, FIONREAD, &nbytes) < 0) || (nbytes <= 0)) - return 0; + r = ioctl(fd_inotify, FIONREAD, &nbytes); + if (r < 0 || nbytes <= 0) + return -errno; buf = malloc(nbytes); - if (buf == NULL) { + if (!buf) { log_error("error getting buffer for inotify"); - return -1; + return -ENOMEM; } nbytes = read(fd_inotify, buf, nbytes); @@ -744,35 +837,23 @@ static int handle_inotify(struct udev *udev) ev = (struct inotify_event *)(buf + pos); dev = udev_watch_lookup(udev, ev->wd); - if (dev != NULL) { - log_debug("inotify event: %x for %s", ev->mask, udev_device_get_devnode(dev)); - if (ev->mask & IN_CLOSE_WRITE) { - char filename[UTIL_PATH_SIZE]; - int fd; - - log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev)); - strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL); - fd = open(filename, O_WRONLY|O_CLOEXEC); - if (fd >= 0) { - if (write(fd, "change", 6) < 0) - log_debug("error writing uevent: %m"); - close(fd); - } - } - if (ev->mask & IN_IGNORED) - udev_watch_end(udev, dev); + if (!dev) + continue; - udev_device_unref(dev); - } + log_debug("inotify event: %x for %s", ev->mask, udev_device_get_devnode(dev)); + if (ev->mask & IN_CLOSE_WRITE) + synthesize_change(dev); + else if (ev->mask & IN_IGNORED) + udev_watch_end(udev, dev); + udev_device_unref(dev); } free(buf); return 0; } -static void handle_signal(struct udev *udev, int signo) -{ +static void handle_signal(struct udev *udev, int signo) { switch (signo) { case SIGINT: case SIGTERM: @@ -832,8 +913,7 @@ static void handle_signal(struct udev *udev, int signo) } } -static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) -{ +static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) { int ctrl = -1, netlink = -1; int fd, n; @@ -874,10 +954,9 @@ static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) * udev.children-max= events are fully serialized if set to 1 * udev.exec-delay= delay execution of every executed program */ -static void kernel_cmdline_options(struct udev *udev) -{ +static void kernel_cmdline_options(struct udev *udev) { _cleanup_free_ char *line = NULL; - char *w, *state; + const char *word, *state; size_t l; int r; @@ -887,10 +966,10 @@ static void kernel_cmdline_options(struct udev *udev) if (r <= 0) return; - FOREACH_WORD_QUOTED(w, l, line, state) { + FOREACH_WORD_QUOTED(word, l, line, state) { char *s, *opt; - s = strndup(w, l); + s = strndup(word, l); if (!s) break; @@ -907,110 +986,135 @@ static void kernel_cmdline_options(struct udev *udev) log_set_max_level(prio); udev_set_log_priority(udev, prio); } else if (startswith(opt, "udev.children-max=")) { - children_max = strtoul(opt + 18, NULL, 0); + arg_children_max = strtoul(opt + 18, NULL, 0); } else if (startswith(opt, "udev.exec-delay=")) { - exec_delay = strtoul(opt + 16, NULL, 0); + arg_exec_delay = strtoul(opt + 16, NULL, 0); + } else if (startswith(opt, "udev.event-timeout=")) { + arg_event_timeout_usec = strtoul(opt + 16, NULL, 0) * USEC_PER_SEC; + arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; } free(s); } } -int main(int argc, char *argv[]) -{ - struct udev *udev; - sigset_t mask; - int daemonize = false; - int resolve_names = 1; +static void help(void) { + printf("%s [OPTIONS...]\n\n" + "Manages devices.\n\n" + " --daemon\n" + " --debug\n" + " --children-max=\n" + " --exec-delay=\n" + " --event-timeout=\n" + " --resolve-names=early|late|never\n" + " --version\n" + " --help\n" + , program_invocation_short_name); +} + +static int parse_argv(int argc, char *argv[]) { static const struct option options[] = { - { "daemon", no_argument, NULL, 'd' }, - { "debug", no_argument, NULL, 'D' }, - { "children-max", required_argument, NULL, 'c' }, - { "exec-delay", required_argument, NULL, 'e' }, - { "resolve-names", required_argument, NULL, 'N' }, - { "help", no_argument, NULL, 'h' }, - { "version", no_argument, NULL, 'V' }, + { "daemon", no_argument, NULL, 'd' }, + { "debug", no_argument, NULL, 'D' }, + { "children-max", required_argument, NULL, 'c' }, + { "exec-delay", required_argument, NULL, 'e' }, + { "event-timeout", required_argument, NULL, 't' }, + { "resolve-names", required_argument, NULL, 'N' }, + { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, 'V' }, {} }; - int fd_ctrl = -1; - int fd_netlink = -1; - int fd_worker = -1; - struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; - struct udev_ctrl_connection *ctrl_conn = NULL; - int rc = 1; - - udev = udev_new(); - if (udev == NULL) - goto exit; - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - udev_set_log_fn(udev, udev_main_log); - log_set_max_level(udev_get_log_priority(udev)); + int c; - log_debug("version %s", VERSION); - label_init("/dev"); + assert(argc >= 0); + assert(argv); - for (;;) { - int option; + while ((c = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL)) >= 0) { - option = getopt_long(argc, argv, "c:de:DtN:hV", options, NULL); - if (option == -1) - break; + switch (c) { - switch (option) { case 'd': - daemonize = true; + arg_daemonize = true; break; case 'c': - children_max = strtoul(optarg, NULL, 0); + arg_children_max = strtoul(optarg, NULL, 0); break; case 'e': - exec_delay = strtoul(optarg, NULL, 0); + arg_exec_delay = strtoul(optarg, NULL, 0); + break; + case 't': + arg_event_timeout_usec = strtoul(optarg, NULL, 0) * USEC_PER_SEC; + arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1; break; case 'D': - debug = true; - log_set_max_level(LOG_DEBUG); - udev_set_log_priority(udev, LOG_DEBUG); + arg_debug = true; break; case 'N': if (streq(optarg, "early")) { - resolve_names = 1; + arg_resolve_names = 1; } else if (streq(optarg, "late")) { - resolve_names = 0; + arg_resolve_names = 0; } else if (streq(optarg, "never")) { - resolve_names = -1; + arg_resolve_names = -1; } else { - fprintf(stderr, "resolve-names must be early, late or never\n"); log_error("resolve-names must be early, late or never"); - goto exit; + return 0; } break; case 'h': - printf("Usage: udevd OPTIONS\n" - " --daemon\n" - " --debug\n" - " --children-max=\n" - " --exec-delay=\n" - " --resolve-names=early|late|never\n" - " --version\n" - " --help\n" - "\n"); - goto exit; + help(); + return 0; case 'V': printf("%s\n", VERSION); - goto exit; + return 0; + case '?': + return -EINVAL; default: - goto exit; + assert_not_reached("Unhandled option"); + } } + return 1; +} + +int main(int argc, char *argv[]) { + struct udev *udev; + sigset_t mask; + int fd_ctrl = -1; + int fd_netlink = -1; + int fd_worker = -1; + struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; + struct udev_ctrl_connection *ctrl_conn = NULL; + int rc = 1, r; + + udev = udev_new(); + if (udev == NULL) + goto exit; + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + udev_set_log_fn(udev, udev_main_log); + log_set_max_level(udev_get_log_priority(udev)); + + log_debug("version %s", VERSION); + label_init("/dev"); + + r = parse_argv(argc, argv); + if (r <= 0) + goto exit; + kernel_cmdline_options(udev); + if (arg_debug) { + log_set_max_level(LOG_DEBUG); + udev_set_log_priority(udev, LOG_DEBUG); + } + if (getuid() != 0) { - fprintf(stderr, "root privileges required\n"); log_error("root privileges required"); goto exit; } @@ -1024,7 +1128,7 @@ int main(int argc, char *argv[]) dev_setup(NULL); /* before opening new files, make sure std{in,out,err} fds are in a sane state */ - if (daemonize) { + if (arg_daemonize) { int fd; fd = open("/dev/null", O_RDWR); @@ -1036,7 +1140,6 @@ int main(int argc, char *argv[]) if (fd > STDERR_FILENO) close(fd); } else { - fprintf(stderr, "cannot open /dev/null\n"); log_error("cannot open /dev/null"); } } @@ -1064,7 +1167,6 @@ int main(int argc, char *argv[]) /* open control and netlink socket */ udev_ctrl = udev_ctrl_new(udev); if (udev_ctrl == NULL) { - fprintf(stderr, "error initializing udev control socket"); log_error("error initializing udev control socket"); rc = 1; goto exit; @@ -1073,7 +1175,6 @@ int main(int argc, char *argv[]) monitor = udev_monitor_new_from_netlink(udev, "kernel"); if (monitor == NULL) { - fprintf(stderr, "error initializing netlink socket\n"); log_error("error initializing netlink socket"); rc = 3; goto exit; @@ -1082,14 +1183,12 @@ int main(int argc, char *argv[]) } if (udev_monitor_enable_receiving(monitor) < 0) { - fprintf(stderr, "error binding netlink socket\n"); log_error("error binding netlink socket"); rc = 3; goto exit; } if (udev_ctrl_enable_receiving(udev_ctrl) < 0) { - fprintf(stderr, "error binding udev control socket\n"); log_error("error binding udev control socket"); rc = 1; goto exit; @@ -1097,7 +1196,7 @@ int main(int argc, char *argv[]) udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); - if (daemonize) { + if (arg_daemonize) { pid_t pid; pid = fork(); @@ -1120,9 +1219,9 @@ int main(int argc, char *argv[]) sd_notify(1, "READY=1"); } - print_kmsg("starting version " VERSION "\n"); + log_info("starting version " VERSION "\n"); - if (!debug) { + if (!arg_debug) { int fd; fd = open("/dev/null", O_RDWR); @@ -1136,7 +1235,6 @@ int main(int argc, char *argv[]) fd_inotify = udev_watch_init(udev); if (fd_inotify < 0) { - fprintf(stderr, "error initializing inotify\n"); log_error("error initializing inotify"); rc = 4; goto exit; @@ -1148,7 +1246,6 @@ int main(int argc, char *argv[]) sigprocmask(SIG_SETMASK, &mask, &sigmask_orig); fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC); if (fd_signal < 0) { - fprintf(stderr, "error creating signalfd\n"); log_error("error creating signalfd"); rc = 5; goto exit; @@ -1156,7 +1253,6 @@ int main(int argc, char *argv[]) /* unnamed socket from workers to the main daemon */ if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) { - fprintf(stderr, "error creating socketpair\n"); log_error("error creating socketpair"); rc = 6; goto exit; @@ -1165,7 +1261,7 @@ int main(int argc, char *argv[]) udev_builtin_init(udev); - rules = udev_rules_new(udev, resolve_names); + rules = udev_rules_new(udev, arg_resolve_names); if (rules == NULL) { log_error("error reading rules"); goto exit; @@ -1205,16 +1301,16 @@ int main(int argc, char *argv[]) goto exit; } - if (children_max <= 0) { + if (arg_children_max <= 0) { cpu_set_t cpu_set; - children_max = 8; + arg_children_max = 8; if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - children_max += CPU_COUNT(&cpu_set) * 2; + arg_children_max += CPU_COUNT(&cpu_set) * 2; } } - log_debug("set children_max to %u", children_max); + log_debug("set children_max to %u", arg_children_max); rc = udev_rules_apply_static_dev_perms(rules); if (rc < 0) @@ -1303,23 +1399,28 @@ int main(int argc, char *argv[]) /* check for hanging events */ udev_list_node_foreach(loop, &worker_list) { struct worker *worker = node_to_worker(loop); + usec_t ts; if (worker->state != WORKER_RUNNING) continue; - if ((now(CLOCK_MONOTONIC) - worker->event_start_usec) > 30 * USEC_PER_SEC) { - log_error("worker [%u] %s timeout; kill it", worker->pid, - worker->event ? worker->event->devpath : ""); - kill(worker->pid, SIGKILL); - worker->state = WORKER_KILLED; + ts = now(CLOCK_MONOTONIC); - /* drop reference taken for state 'running' */ - worker_unref(worker); - if (worker->event) { + if ((ts - worker->event_start_usec) > arg_event_timeout_warn_usec) { + if ((ts - worker->event_start_usec) > arg_event_timeout_usec) { + log_error("worker [%u] %s timeout; kill it", worker->pid, worker->event->devpath); + kill(worker->pid, SIGKILL); + worker->state = WORKER_KILLED; + + /* drop reference taken for state 'running' */ + worker_unref(worker); log_error("seq %llu '%s' killed", udev_device_get_seqnum(worker->event->dev), worker->event->devpath); worker->event->exitcode = -64; event_queue_delete(worker->event); worker->event = NULL; + } else if (!worker->event_warned) { + log_warning("worker [%u] %s is taking a long time", worker->pid, worker->event->devpath); + worker->event_warned = true; } } } @@ -1377,7 +1478,7 @@ int main(int argc, char *argv[]) if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) { udev_builtin_init(udev); if (rules == NULL) - rules = udev_rules_new(udev, resolve_names); + rules = udev_rules_new(udev, arg_resolve_names); if (rules != NULL) event_queue_start(udev); }