X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=8eaf2cdc8c36c602870e8c5bb295a562ee2c42bb;hp=8bec03e77f0e0874e2396a3f02bb15d178dd2f1b;hb=62a30b2c490512fe22a4e5faacb1d55763ead1e0;hpb=f7c1ad4fd4190bee32db0aa26c8e9fe7e19d8816 diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 8bec03e77..8eaf2cdc8 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -26,33 +26,28 @@ #include #include #include -#include #include -#include #include -#include #include #include #include #include -#include #include #include #include -#include #include #include #include #include -#include -#include "udev.h" -#include "udev-util.h" -#include "rtnl-util.h" #include "sd-daemon.h" +#include "rtnl-util.h" #include "cgroup-util.h" #include "dev-setup.h" #include "fileio.h" +#include "selinux-util.h" +#include "udev.h" +#include "udev-util.h" static struct udev_rules *rules; static struct udev_ctrl *udev_ctrl; @@ -88,6 +83,7 @@ struct event { struct udev_list_node node; struct udev *udev; struct udev_device *dev; + struct udev_device *dev_kernel; enum event_state state; int exitcode; unsigned long long int delaying_seqnum; @@ -138,6 +134,7 @@ static inline struct worker *node_to_worker(struct udev_list_node *node) { static void event_queue_delete(struct event *event) { udev_list_node_remove(&event->node); udev_device_unref(event->dev); + udev_device_unref(event->dev_kernel); free(event); } @@ -157,7 +154,7 @@ static void worker_unref(struct worker *worker) { worker->refcount--; if (worker->refcount > 0) return; - log_debug("worker [%u] cleaned up", worker->pid); + log_debug("worker ["PID_FMT"] cleaned up", worker->pid); worker_cleanup(worker); } @@ -294,7 +291,7 @@ static void worker_new(struct event *event) { fd_lock = open(udev_device_get_devnode(d), O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK); if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) { log_debug_errno(errno, "Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d)); - err = -EWOULDBLOCK; + err = -EAGAIN; fd_lock = safe_close(fd_lock); goto skip; } @@ -413,7 +410,7 @@ out: event->state = EVENT_RUNNING; udev_list_node_append(&worker->node, &worker_list); children++; - log_debug("seq %llu forked new worker [%u]", udev_device_get_seqnum(event->dev), pid); + log_debug("seq %llu forked new worker ["PID_FMT"]", udev_device_get_seqnum(event->dev), pid); break; } } @@ -430,7 +427,8 @@ static void event_run(struct event *event) { count = udev_monitor_send_device(monitor, worker->monitor, event->dev); if (count < 0) { - log_error_errno(errno, "worker [%u] did not accept message %zi (%m), kill it", worker->pid, count); + log_error_errno(errno, "worker ["PID_FMT"] did not accept message %zi (%m), kill it", + worker->pid, count); kill(worker->pid, SIGKILL); worker->state = WORKER_KILLED; continue; @@ -463,6 +461,8 @@ static int event_queue_insert(struct udev_device *dev) { event->udev = udev_device_get_udev(dev); event->dev = dev; + event->dev_kernel = udev_device_shallow_clone(dev); + udev_device_copy_properties(event->dev_kernel, dev); event->seqnum = udev_device_get_seqnum(dev); event->devpath = udev_device_get_devpath(dev); event->devpath_len = strlen(event->devpath); @@ -816,11 +816,11 @@ static int synthesize_change(struct udev_device *dev) { } static int handle_inotify(struct udev *udev) { - uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event); + union inotify_event_buffer buffer; struct inotify_event *e; ssize_t l; - l = read(fd_inotify, buffer, sizeof(buffer)); + l = read(fd_inotify, &buffer, sizeof(buffer)); if (l < 0) { if (errno == EAGAIN || errno == EINTR) return 0; @@ -868,28 +868,33 @@ static void handle_signal(struct udev *udev, int signo) { if (worker->pid != pid) continue; - log_debug("worker [%u] exit", pid); + log_debug("worker ["PID_FMT"] exit", pid); if (WIFEXITED(status)) { if (WEXITSTATUS(status) != 0) - log_error("worker [%u] exit with return code %i", + log_error("worker ["PID_FMT"] exit with return code %i", pid, WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - log_error("worker [%u] terminated by signal %i (%s)", + log_error("worker ["PID_FMT"] terminated by signal %i (%s)", pid, WTERMSIG(status), strsignal(WTERMSIG(status))); } else if (WIFSTOPPED(status)) { - log_error("worker [%u] stopped", pid); + log_error("worker ["PID_FMT"] stopped", pid); } else if (WIFCONTINUED(status)) { - log_error("worker [%u] continued", pid); + log_error("worker ["PID_FMT"] continued", pid); } else { - log_error("worker [%u] exit with status 0x%04x", pid, status); + log_error("worker ["PID_FMT"] exit with status 0x%04x", pid, status); } if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { if (worker->event) { - log_error("worker [%u] failed while handling '%s'", + log_error("worker ["PID_FMT"] failed while handling '%s'", pid, worker->event->devpath); worker->event->exitcode = -32; + /* delete state from disk */ + udev_device_delete_db(worker->event->dev); + udev_device_tag_index(worker->event->dev, NULL, false); + /* forward kernel event without ammending it */ + udev_monitor_send_device(monitor, NULL, worker->event->dev_kernel); event_queue_delete(worker->event); /* drop reference taken for state 'running' */ @@ -907,6 +912,20 @@ static void handle_signal(struct udev *udev, int signo) { } } +static void event_queue_update(void) { + int r; + + if (!udev_list_node_is_empty(&event_list)) { + r = touch("/run/udev/queue"); + if (r < 0) + log_warning_errno(r, "could not touch /run/udev/queue: %m"); + } else { + r = unlink("/run/udev/queue"); + if (r < 0 && errno != ENOENT) + log_warning("could not unlink /run/udev/queue: %m"); + } +} + static int systemd_fds(struct udev *udev, int *rctrl, int *rnetlink) { int ctrl = -1, netlink = -1; int fd, n; @@ -1003,14 +1022,15 @@ static void kernel_cmdline_options(struct udev *udev) { 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" + " -h --help Print this message\n" + " --version Print version of the program\n" + " --daemon Detach and run in the background\n" + " --debug Enable debug output\n" + " --children-max=INT Set maximum number of workers\n" + " --exec-delay=SECONDS Seconds to wait before executing RUN=\n" + " --event-timeout=SECONDS Seconds to wait before terminating an event\n" + " --resolve-names=early|late|never\n" + " When to resolve users and groups\n" , program_invocation_short_name); } @@ -1366,15 +1386,7 @@ int main(int argc, char *argv[]) { } /* tell settle that we are busy or idle */ - if (!udev_list_node_is_empty(&event_list)) { - int fd; - - fd = open("/run/udev/queue", O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC|O_NOFOLLOW, 0444); - if (fd >= 0) - close(fd); - } else { - unlink("/run/udev/queue"); - } + event_queue_update(); fdcount = epoll_wait(fd_ep, ev, ELEMENTSOF(ev), timeout); if (fdcount < 0) @@ -1407,18 +1419,14 @@ int main(int argc, char *argv[]) { 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); + log_error("worker ["PID_FMT"] %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); + log_warning("worker ["PID_FMT"] %s is taking a long time", worker->pid, worker->event->devpath); worker->event_warned = true; } } @@ -1466,8 +1474,8 @@ int main(int argc, char *argv[]) { struct udev_device *dev; dev = udev_monitor_receive_device(monitor); - if (dev != NULL) { - udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC)); + if (dev) { + udev_device_ensure_usec_initialized(dev, NULL); if (event_queue_insert(dev) < 0) udev_device_unref(dev); } @@ -1499,6 +1507,11 @@ int main(int argc, char *argv[]) { if (is_inotify) handle_inotify(udev); + /* tell settle that we are busy or idle, this needs to be before the + * PING handling + */ + event_queue_update(); + /* * This needs to be after the inotify handling, to make sure, * that the ping is send back after the possibly generated