summaryrefslogtreecommitdiff
path: root/src/udev/udevd.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/udev/udevd.c')
-rw-r--r--src/udev/udevd.c584
1 files changed, 284 insertions, 300 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index d56e3d1ed9..6cfb2bcfcd 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -52,9 +52,11 @@
#include "cgroup-util.h"
#include "dev-setup.h"
#include "fileio.h"
+#include "hashmap.h"
static struct udev_rules *rules;
static struct udev_ctrl *udev_ctrl;
+static struct udev_ctrl_connection *udev_ctrl_conn;
static struct udev_monitor *monitor;
static int worker_watch[2] = { -1, -1 };
static int fd_signal = -1;
@@ -62,17 +64,16 @@ static int fd_ep = -1;
static int fd_inotify = -1;
static bool stop_exec_queue;
static bool reload;
-static int children;
static bool arg_debug = false;
static int arg_daemonize = false;
static int arg_resolve_names = 1;
-static int arg_children_max;
+static unsigned 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);
+Hashmap *workers;
static char *udev_cgroup;
static struct udev_list properties_list;
static bool udev_exit;
@@ -88,8 +89,8 @@ struct event {
struct udev *udev;
struct udev_device *dev;
struct udev_device *dev_kernel;
+ struct worker *worker;
enum event_state state;
- int exitcode;
unsigned long long int delaying_seqnum;
unsigned long long int seqnum;
const char *devpath;
@@ -98,6 +99,8 @@ struct event {
dev_t devnum;
int ifindex;
bool is_block;
+ usec_t start_usec;
+ bool warned;
};
static inline struct event *node_to_event(struct udev_list_node *node) {
@@ -121,60 +124,106 @@ struct worker {
struct udev_monitor *monitor;
enum worker_state state;
struct event *event;
- usec_t event_start_usec;
- bool event_warned;
};
/* passed from worker to main process */
struct worker_message {
- int exitcode;
};
-static inline struct worker *node_to_worker(struct udev_list_node *node) {
- return container_of(node, struct worker, node);
-}
+static void event_free(struct event *event) {
+ if (!event)
+ return;
-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);
+
+ if (event->worker)
+ event->worker->event = NULL;
+
free(event);
}
-static struct worker *worker_ref(struct worker *worker) {
- worker->refcount++;
- return worker;
-}
+static void worker_free(struct worker *worker) {
+ if (!worker)
+ return;
-static void worker_cleanup(struct worker *worker) {
- udev_list_node_remove(&worker->node);
+ hashmap_remove(workers, UINT_TO_PTR(worker->pid));
udev_monitor_unref(worker->monitor);
- children--;
+ udev_unref(worker->udev);
+ event_free(worker->event);
+
free(worker);
}
-static void worker_unref(struct worker *worker) {
- worker->refcount--;
- if (worker->refcount > 0)
- return;
- log_debug("worker ["PID_FMT"] cleaned up", worker->pid);
- worker_cleanup(worker);
+static void workers_free(void) {
+ struct worker *worker;
+ Iterator i;
+
+ HASHMAP_FOREACH(worker, workers, i)
+ worker_free(worker);
+
+ hashmap_free(workers);
+ workers = NULL;
}
-static void worker_list_cleanup(struct udev *udev) {
- struct udev_list_node *loop, *tmp;
+static int worker_new(struct worker **ret, struct udev *udev, struct udev_monitor *worker_monitor, pid_t pid) {
+ _cleanup_free_ struct worker *worker = NULL;
+ int r;
- udev_list_node_foreach_safe(loop, tmp, &worker_list) {
- struct worker *worker = node_to_worker(loop);
+ assert(ret);
+ assert(udev);
+ assert(worker_monitor);
+ assert(pid > 1);
- worker_cleanup(worker);
- }
+ worker = new0(struct worker, 1);
+ if (!worker)
+ return -ENOMEM;
+
+ worker->refcount = 1;
+ worker->udev = udev_ref(udev);
+ /* close monitor, but keep address around */
+ udev_monitor_disconnect(worker_monitor);
+ worker->monitor = udev_monitor_ref(worker_monitor);
+ worker->pid = pid;
+
+ r = hashmap_ensure_allocated(&workers, NULL);
+ if (r < 0)
+ return r;
+
+ r = hashmap_put(workers, UINT_TO_PTR(pid), worker);
+ if (r < 0)
+ return r;
+
+ *ret = worker;
+ worker = NULL;
+
+ return 0;
}
-static void worker_new(struct event *event) {
+static void worker_attach_event(struct worker *worker, struct event *event) {
+ assert(worker);
+ assert(event);
+ assert(!event->worker);
+ assert(!worker->event);
+
+ worker->state = WORKER_RUNNING;
+ worker->event = event;
+ event->state = EVENT_RUNNING;
+ event->start_usec = now(CLOCK_MONOTONIC);
+ event->warned = false;
+ event->worker = worker;
+}
+
+static int worker_send_message(int fd) {
+ struct worker_message message = {};
+
+ return loop_write(fd, &message, sizeof(message), false);
+}
+
+static void worker_spawn(struct event *event) {
struct udev *udev = event->udev;
- struct worker *worker;
- struct udev_monitor *worker_monitor;
+ _cleanup_udev_monitor_unref_ struct udev_monitor *worker_monitor = NULL;
pid_t pid;
/* listen for new events */
@@ -185,15 +234,6 @@ static void worker_new(struct event *event) {
udev_monitor_allow_unicast_sender(worker_monitor, monitor);
udev_monitor_enable_receiving(worker_monitor);
- worker = new0(struct worker, 1);
- if (worker == NULL) {
- udev_monitor_unref(worker_monitor);
- return;
- }
- /* worker + event reference */
- worker->refcount = 2;
- worker->udev = udev;
-
pid = fork();
switch (pid) {
case 0: {
@@ -201,14 +241,13 @@ static void worker_new(struct event *event) {
int fd_monitor;
struct epoll_event ep_signal, ep_monitor;
sigset_t mask;
- int rc = EXIT_SUCCESS;
+ int r = 0;
/* take initial device from queue */
dev = event->dev;
event->dev = NULL;
- free(worker);
- worker_list_cleanup(udev);
+ workers_free();
event_queue_cleanup(udev, EVENT_UNDEF);
udev_monitor_unref(monitor);
udev_ctrl_unref(udev_ctrl);
@@ -219,15 +258,13 @@ static void worker_new(struct event *event) {
sigfillset(&mask);
fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
if (fd_signal < 0) {
- log_error_errno(errno, "error creating signalfd %m");
- rc = 2;
+ r = log_error_errno(errno, "error creating signalfd %m");
goto out;
}
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- log_error_errno(errno, "error creating epoll fd: %m");
- rc = 3;
+ r = log_error_errno(errno, "error creating epoll fd: %m");
goto out;
}
@@ -242,8 +279,7 @@ static void worker_new(struct event *event) {
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_signal, &ep_signal) < 0 ||
epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_monitor, &ep_monitor) < 0) {
- log_error_errno(errno, "fail to add fds to epoll: %m");
- rc = 4;
+ r = log_error_errno(errno, "fail to add fds to epoll: %m");
goto out;
}
@@ -255,14 +291,12 @@ static void worker_new(struct event *event) {
for (;;) {
struct udev_event *udev_event;
- struct worker_message msg;
int fd_lock = -1;
- int err = 0, r;
log_debug("seq %llu running", udev_device_get_seqnum(dev));
udev_event = udev_event_new(dev);
if (udev_event == NULL) {
- rc = 5;
+ r = -ENOMEM;
goto out;
}
@@ -293,8 +327,8 @@ 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 = -EAGAIN;
fd_lock = safe_close(fd_lock);
+ r = -EAGAIN;
goto skip;
}
}
@@ -323,14 +357,12 @@ static void worker_new(struct event *event) {
udev_monitor_send_device(worker_monitor, NULL, dev);
skip:
- log_debug("seq %llu processed with %i", udev_device_get_seqnum(dev), err);
+ log_debug("seq %llu processed", udev_device_get_seqnum(dev));
/* send udevd the result of the event execution */
- memzero(&msg, sizeof(struct worker_message));
- msg.exitcode = err;
- r = send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
+ r = worker_send_message(worker_watch[WRITE_END]);
if (r < 0)
- log_error_errno(errno, "failed to send result of seq %llu to main daemon: %m",
+ log_error_errno(r, "failed to send result of seq %llu to main daemon: %m",
udev_device_get_seqnum(dev));
udev_device_unref(dev);
@@ -353,7 +385,7 @@ skip:
if (fdcount < 0) {
if (errno == EINTR)
continue;
- log_error_errno(errno, "failed to poll: %m");
+ r = log_error_errno(errno, "failed to poll: %m");
goto out;
}
@@ -384,39 +416,36 @@ out:
close(worker_watch[WRITE_END]);
udev_rules_unref(rules);
udev_builtin_exit(udev);
- udev_monitor_unref(worker_monitor);
udev_unref(udev);
log_close();
- exit(rc);
+ _exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
}
case -1:
- udev_monitor_unref(worker_monitor);
event->state = EVENT_QUEUED;
- free(worker);
log_error_errno(errno, "fork of child failed: %m");
break;
default:
- /* close monitor, but keep address around */
- udev_monitor_disconnect(worker_monitor);
- worker->monitor = worker_monitor;
- 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);
- children++;
+ {
+ struct worker *worker;
+ int r;
+
+ r = worker_new(&worker, udev, worker_monitor, pid);
+ if (r < 0)
+ return;
+
+ worker_attach_event(worker, event);
+
log_debug("seq %llu forked new worker ["PID_FMT"]", udev_device_get_seqnum(event->dev), pid);
break;
}
+ }
}
static void event_run(struct event *event) {
- struct udev_list_node *loop;
+ struct worker *worker;
+ Iterator i;
- udev_list_node_foreach(loop, &worker_list) {
- struct worker *worker = node_to_worker(loop);
+ HASHMAP_FOREACH(worker, workers, i) {
ssize_t count;
if (worker->state != WORKER_IDLE)
@@ -430,23 +459,18 @@ static void event_run(struct event *event) {
worker->state = WORKER_KILLED;
continue;
}
- worker_ref(worker);
- worker->event = event;
- worker->state = WORKER_RUNNING;
- worker->event_start_usec = now(CLOCK_MONOTONIC);
- worker->event_warned = false;
- event->state = EVENT_RUNNING;
+ worker_attach_event(worker, event);
return;
}
- if (children >= arg_children_max) {
+ if (hashmap_size(workers) >= arg_children_max) {
if (arg_children_max > 1)
- log_debug("maximum number (%i) of children reached", children);
+ log_debug("maximum number (%i) of children reached", hashmap_size(workers));
return;
}
/* start new worker and pass initial device */
- worker_new(event);
+ worker_spawn(event);
}
static int event_queue_insert(struct udev_device *dev) {
@@ -476,12 +500,11 @@ static int event_queue_insert(struct udev_device *dev) {
return 0;
}
-static void worker_kill(struct udev *udev) {
- struct udev_list_node *loop;
-
- udev_list_node_foreach(loop, &worker_list) {
- struct worker *worker = node_to_worker(loop);
+static void worker_kill(void) {
+ struct worker *worker;
+ Iterator i;
+ HASHMAP_FOREACH(worker, workers, i) {
if (worker->state == WORKER_KILLED)
continue;
@@ -588,7 +611,7 @@ static void event_queue_cleanup(struct udev *udev, enum event_state match_type)
if (match_type != EVENT_UNDEF && match_type != event->state)
continue;
- event_queue_delete(event);
+ event_free(event);
}
}
@@ -604,8 +627,7 @@ static void worker_returned(int fd_worker) {
struct cmsghdr *cmsg;
ssize_t size;
struct ucred *ucred = NULL;
- struct udev_list_node *loop;
- bool found = false;
+ struct worker *worker;
memzero(&iovec, sizeof(struct iovec));
iovec.iov_base = &msg;
@@ -619,8 +641,11 @@ static void worker_returned(int fd_worker) {
size = recvmsg(fd_worker, &msghdr, MSG_DONTWAIT);
if (size < 0) {
- if (errno == EAGAIN || errno == EINTR)
- return;
+ if (errno == EINTR)
+ continue;
+ else if (errno == EAGAIN)
+ /* nothing more to read */
+ break;
log_error_errno(errno, "failed to receive message: %m");
return;
@@ -642,52 +667,56 @@ static void worker_returned(int fd_worker) {
}
/* lookup worker who sent the signal */
- udev_list_node_foreach(loop, &worker_list) {
- struct worker *worker = node_to_worker(loop);
-
- if (worker->pid != ucred->pid)
- continue;
- else
- found = true;
-
- /* worker returned */
- if (worker->event) {
- worker->event->exitcode = msg.exitcode;
- event_queue_delete(worker->event);
- worker->event = NULL;
- }
- if (worker->state != WORKER_KILLED)
- worker->state = WORKER_IDLE;
- worker_unref(worker);
- break;
+ worker = hashmap_get(workers, UINT_TO_PTR(ucred->pid));
+ if (!worker) {
+ log_debug("worker ["PID_FMT"] returned, but is no longer tracked", ucred->pid);
+ continue;
}
- if (!found)
- log_warning("unknown worker ["PID_FMT"] returned", ucred->pid);
+ if (worker->state != WORKER_KILLED)
+ worker->state = WORKER_IDLE;
+
+ /* worker returned */
+ event_free(worker->event);
+ }
+}
+
+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");
}
}
/* receive the udevd message from userspace */
-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;
+static void handle_ctrl_msg(struct udev_ctrl *uctrl) {
+ _cleanup_udev_ctrl_connection_unref_ struct udev_ctrl_connection *ctrl_conn = NULL;
+ _cleanup_udev_ctrl_msg_unref_ struct udev_ctrl_msg *ctrl_msg = NULL;
const char *str;
int i;
+ assert(uctrl);
+
ctrl_conn = udev_ctrl_get_connection(uctrl);
- if (ctrl_conn == NULL)
- goto out;
+ if (!ctrl_conn)
+ return;
ctrl_msg = udev_ctrl_receive_msg(ctrl_conn);
- if (ctrl_msg == NULL)
- goto out;
+ if (!ctrl_msg)
+ return;
i = udev_ctrl_get_set_log_level(ctrl_msg);
if (i >= 0) {
log_debug("udevd message (SET_LOG_LEVEL) received, log_priority=%i", i);
log_set_max_level(i);
- worker_kill(udev);
+ worker_kill();
}
if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
@@ -729,7 +758,7 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) {
}
free(key);
}
- worker_kill(udev);
+ worker_kill();
}
i = udev_ctrl_get_set_children_max(ctrl_msg);
@@ -738,18 +767,22 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) {
arg_children_max = i;
}
- if (udev_ctrl_get_ping(ctrl_msg) > 0)
+ if (udev_ctrl_get_ping(ctrl_msg) > 0) {
log_debug("udevd message (SYNC) received");
+ /* tell settle that we are busy or idle, this needs to be before the
+ * PING handling
+ */
+ event_queue_update();
+ }
if (udev_ctrl_get_exit(ctrl_msg) > 0) {
log_debug("udevd message (EXIT) received");
udev_exit = true;
/* keep reference to block the client until we exit */
- udev_ctrl_connection_ref(ctrl_conn);
+ udev_ctrl_conn = udev_ctrl_connection_ref(ctrl_conn);
}
-out:
- udev_ctrl_msg_unref(ctrl_msg);
- return udev_ctrl_connection_unref(ctrl_conn);
+
+ return;
}
static int synthesize_change(struct udev_device *dev) {
@@ -898,61 +931,48 @@ static void handle_signal(struct udev *udev, int signo) {
for (;;) {
pid_t pid;
int status;
- struct udev_list_node *loop, *tmp;
- bool found = false;
+ struct worker *worker;
pid = waitpid(-1, &status, WNOHANG);
if (pid <= 0)
break;
- udev_list_node_foreach_safe(loop, tmp, &worker_list) {
- struct worker *worker = node_to_worker(loop);
+ worker = hashmap_get(workers, UINT_TO_PTR(pid));
+ if (!worker) {
+ log_warning("worker ["PID_FMT"] is unknown, ignoring", pid);
+ continue;
+ }
- if (worker->pid != pid)
- continue;
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) == 0)
+ log_debug("worker ["PID_FMT"] exited", pid);
else
- found = true;
-
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status) == 0)
- log_debug("worker ["PID_FMT"] exited", pid);
- else
- log_warning("worker ["PID_FMT"] exited with return code %i", pid, WEXITSTATUS(status));
- } else if (WIFSIGNALED(status)) {
- log_warning("worker ["PID_FMT"] terminated by signal %i (%s)",
- pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
- } else if (WIFSTOPPED(status)) {
- log_info("worker ["PID_FMT"] stopped", pid);
- break;
- } else if (WIFCONTINUED(status)) {
- log_info("worker ["PID_FMT"] continued", pid);
- break;
- } else {
- log_warning("worker ["PID_FMT"] exit with status 0x%04x", pid, status);
- }
+ log_warning("worker ["PID_FMT"] exited with return code %i", pid, WEXITSTATUS(status));
+ } else if (WIFSIGNALED(status)) {
+ log_warning("worker ["PID_FMT"] terminated by signal %i (%s)",
+ pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ } else if (WIFSTOPPED(status)) {
+ log_info("worker ["PID_FMT"] stopped", pid);
+ continue;
+ } else if (WIFCONTINUED(status)) {
+ log_info("worker ["PID_FMT"] continued", pid);
+ continue;
+ } else {
+ log_warning("worker ["PID_FMT"] exit with status 0x%04x", pid, status);
+ }
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
- if (worker->event) {
- 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 amending it */
- udev_monitor_send_device(monitor, NULL, worker->event->dev_kernel);
- event_queue_delete(worker->event);
-
- /* drop reference taken for state 'running' */
- worker_unref(worker);
- }
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+ if (worker->event) {
+ log_error("worker ["PID_FMT"] failed while handling '%s'", pid, worker->event->devpath);
+ /* delete state from disk */
+ udev_device_delete_db(worker->event->dev);
+ udev_device_tag_index(worker->event->dev, NULL, false);
+ /* forward kernel event without amending it */
+ udev_monitor_send_device(monitor, NULL, worker->event->dev_kernel);
}
- worker_unref(worker);
- break;
}
- if (!found)
- log_warning("worker ["PID_FMT"] is unknown, ignoring", pid);
+ worker_free(worker);
}
break;
case SIGHUP:
@@ -961,76 +981,53 @@ 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(UDEV_ROOT_RUN "/udev/queue");
- if (r < 0)
- log_warning_errno(r, "could not touch " UDEV_ROOT_RUN "/udev/queue: %m");
- } else {
- r = unlink(UDEV_ROOT_RUN "/udev/queue");
- if (r < 0 && errno != ENOENT)
- log_warning("could not unlink " UDEV_ROOT_RUN "/udev/queue: %m");
- }
-}
-
/*
* read the kernel command line, in case we need to get into debug mode
- * udev.log-priority=<level> syslog priority
- * udev.children-max=<number of workers> events are fully serialized if set to 1
- * udev.exec-delay=<number of seconds> delay execution of every executed program
+ * udev.log-priority=<level> syslog priority
+ * udev.children-max=<number of workers> events are fully serialized if set to 1
+ * udev.exec-delay=<number of seconds> delay execution of every executed program
+ * udev.event-timeout=<number of seconds> seconds to wait before terminating an event
*/
-static void kernel_cmdline_options(struct udev *udev) {
- _cleanup_free_ char *line = NULL;
- const char *word, *state;
- size_t l;
+static int parse_proc_cmdline_item(const char *key, const char *value) {
int r;
- r = proc_cmdline(&line);
- if (r < 0) {
- log_warning_errno(r, "Failed to read /proc/cmdline, ignoring: %m");
- return;
- }
+ assert(key);
- FOREACH_WORD_QUOTED(word, l, line, state) {
- char *s, *opt, *value;
+ if (!value)
+ return 0;
- s = strndup(word, l);
- if (!s)
- break;
+ if (startswith(key, "rd."))
+ key += strlen("rd.");
- /* accept the same options for the initrd, prefixed with "rd." */
- if (in_initrd() && startswith(s, "rd."))
- opt = s + 3;
- else
- opt = s;
+ if (startswith(key, "udev."))
+ key += strlen("udev.");
+ else
+ return 0;
- if ((value = startswith(opt, "udev.log-priority="))) {
- int prio;
+ if (streq(key, "log-priority")) {
+ int prio;
- prio = util_log_priority(value);
- log_set_max_level(prio);
- } else if ((value = startswith(opt, "udev.children-max="))) {
- r = safe_atoi(value, &arg_children_max);
- if (r < 0)
- log_warning("Invalid udev.children-max ignored: %s", value);
- } else if ((value = startswith(opt, "udev.exec-delay="))) {
- r = safe_atoi(value, &arg_exec_delay);
- if (r < 0)
- log_warning("Invalid udev.exec-delay ignored: %s", value);
- } else if ((value = startswith(opt, "udev.event-timeout="))) {
- r = safe_atou64(value, &arg_event_timeout_usec);
- if (r < 0) {
- log_warning("Invalid udev.event-timeout ignored: %s", value);
- break;
- }
+ prio = util_log_priority(value);
+ log_set_max_level(prio);
+ } else if (streq(key, "children-max")) {
+ r = safe_atou(value, &arg_children_max);
+ if (r < 0)
+ log_warning("invalid udev.children-max ignored: %s", value);
+ } else if (streq(key, "exec-delay")) {
+ r = safe_atoi(value, &arg_exec_delay);
+ if (r < 0)
+ log_warning("invalid udev.exec-delay ignored: %s", value);
+ } else if (streq(key, "event-timeout")) {
+ r = safe_atou64(value, &arg_event_timeout_usec);
+ if (r < 0)
+ log_warning("invalid udev.event-timeout ignored: %s", value);
+ else {
arg_event_timeout_usec *= USEC_PER_SEC;
arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
}
-
- free(s);
}
+
+ return 0;
}
static void help(void) {
@@ -1075,7 +1072,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_daemonize = true;
break;
case 'c':
- r = safe_atoi(optarg, &arg_children_max);
+ r = safe_atou(optarg, &arg_children_max);
if (r < 0)
log_warning("Invalid --children-max ignored: %s", optarg);
break;
@@ -1136,12 +1133,13 @@ int main(int argc, char *argv[]) {
struct epoll_event ep_signal = { .events = EPOLLIN };
struct epoll_event ep_netlink = { .events = EPOLLIN };
struct epoll_event ep_worker = { .events = EPOLLIN };
- struct udev_ctrl_connection *ctrl_conn = NULL;
- int rc = 1, r, one = 1;
+ int r = 0, one = 1;
udev = udev_new();
- if (udev == NULL)
+ if (!udev) {
+ r = log_error_errno(errno, "could not allocate udev context: %m");
goto exit;
+ }
log_set_target(LOG_TARGET_AUTO);
log_open();
@@ -1150,13 +1148,15 @@ int main(int argc, char *argv[]) {
if (r <= 0)
goto exit;
- kernel_cmdline_options(udev);
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0)
+ log_warning_errno(r, "failed to parse kernel command line, ignoring: %m");
if (arg_debug)
log_set_max_level(LOG_DEBUG);
if (getuid() != 0) {
- log_error("root privileges required");
+ r = log_error_errno(EPERM, "root privileges required");
goto exit;
}
@@ -1169,7 +1169,7 @@ int main(int argc, char *argv[]) {
/* set umask before creating any file/directory */
r = chdir("/");
if (r < 0) {
- log_error_errno(errno, "could not change dir to /: %m");
+ r = log_error_errno(errno, "could not change dir to /: %m");
goto exit;
}
@@ -1179,11 +1179,11 @@ int main(int argc, char *argv[]) {
r = mkdir(UDEV_ROOT_RUN "/udev", 0755);
if (r < 0 && errno != EEXIST) {
- log_error_errno(errno, "could not create " UDEV_ROOT_RUN "/udev: %m");
+ r = log_error_errno(errno, "could not create " UDEV_ROOT_RUN "/udev: %m");
goto exit;
}
- dev_setup(NULL);
+ dev_setup(NULL, UID_INVALID, GID_INVALID);
/* before opening new files, make sure std{in,out,err} fds are in a sane state */
if (arg_daemonize) {
@@ -1204,30 +1204,26 @@ int main(int argc, char *argv[]) {
/* open control and netlink socket */
udev_ctrl = udev_ctrl_new(udev);
- if (udev_ctrl == NULL) {
- log_error("error initializing udev control socket");
- rc = 1;
+ if (!udev_ctrl) {
+ r = log_error_errno(EINVAL, "error initializing udev control socket");
goto exit;
}
fd_ctrl = udev_ctrl_get_fd(udev_ctrl);
monitor = udev_monitor_new_from_netlink(udev, "kernel");
- if (monitor == NULL) {
- log_error("error initializing netlink socket");
- rc = 3;
+ if (!monitor) {
+ r = log_error_errno(EINVAL, "error initializing netlink socket");
goto exit;
}
fd_netlink = udev_monitor_get_fd(monitor);
if (udev_monitor_enable_receiving(monitor) < 0) {
- log_error("error binding netlink socket");
- rc = 3;
+ r = log_error_errno(EINVAL, "error binding netlink socket");
goto exit;
}
if (udev_ctrl_enable_receiving(udev_ctrl) < 0) {
- log_error("error binding udev control socket");
- rc = 1;
+ r = log_error_errno(EINVAL, "error binding udev control socket");
goto exit;
}
@@ -1238,14 +1234,14 @@ int main(int argc, char *argv[]) {
udev_builtin_init(udev);
rules = udev_rules_new(udev, arg_resolve_names);
- if (rules == NULL) {
- log_error("error reading rules");
+ if (!rules) {
+ r = log_error_errno(ENOMEM, "error reading rules");
goto exit;
}
- rc = udev_rules_apply_static_dev_perms(rules);
- if (rc < 0)
- log_error_errno(rc, "failed to apply permissions on static device nodes - %m");
+ r = udev_rules_apply_static_dev_perms(rules);
+ if (r < 0)
+ log_error_errno(r, "failed to apply permissions on static device nodes: %m");
if (arg_daemonize) {
pid_t pid;
@@ -1255,12 +1251,12 @@ int main(int argc, char *argv[]) {
case 0:
break;
case -1:
- log_error_errno(errno, "fork of daemon failed: %m");
- rc = 4;
+ r = log_error_errno(errno, "fork of daemon failed: %m");
goto exit;
default:
- rc = EXIT_SUCCESS;
- goto exit_daemonize;
+ mac_selinux_finish();
+ log_close();
+ _exit(EXIT_SUCCESS);
}
setsid();
@@ -1268,7 +1264,7 @@ int main(int argc, char *argv[]) {
write_string_file("/proc/self/oom_score_adj", "-1000");
}
- if (arg_children_max <= 0) {
+ if (arg_children_max == 0) {
cpu_set_t cpu_set;
arg_children_max = 8;
@@ -1280,12 +1276,10 @@ int main(int argc, char *argv[]) {
log_debug("set children_max to %u", arg_children_max);
udev_list_node_init(&event_list);
- udev_list_node_init(&worker_list);
fd_inotify = udev_watch_init(udev);
if (fd_inotify < 0) {
- log_error("error initializing inotify");
- rc = 4;
+ r = log_error_errno(ENOMEM, "error initializing inotify");
goto exit;
}
/* watch rules.d paths for changes */
@@ -1307,15 +1301,13 @@ 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) {
- log_error("error creating signalfd");
- rc = 5;
+ r = log_error_errno(errno, "error creating signalfd");
goto exit;
}
/* unnamed socket from workers to the main daemon */
if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) {
- log_error("error creating socketpair");
- rc = 6;
+ r = log_error_errno(errno, "error creating socketpair");
goto exit;
}
fd_worker = worker_watch[READ_END];
@@ -1371,15 +1363,15 @@ int main(int argc, char *argv[]) {
/* discard queued events and kill workers */
event_queue_cleanup(udev, EVENT_QUEUED);
- worker_kill(udev);
+ worker_kill();
/* exit after all has cleaned up */
- if (udev_list_node_is_empty(&event_list) && children == 0)
+ if (udev_list_node_is_empty(&event_list) && hashmap_isempty(workers))
break;
/* timeout at exit for workers to finish */
timeout = 30 * MSEC_PER_SEC;
- } else if (udev_list_node_is_empty(&event_list) && children == 0) {
+ } else if (udev_list_node_is_empty(&event_list) && hashmap_isempty(workers)) {
/* we are idle */
timeout = -1;
@@ -1399,7 +1391,8 @@ int main(int argc, char *argv[]) {
continue;
if (fdcount == 0) {
- struct udev_list_node *loop;
+ struct worker *worker;
+ Iterator j;
/* timeout */
if (udev_exit) {
@@ -1410,30 +1403,31 @@ int main(int argc, char *argv[]) {
/* kill idle workers */
if (udev_list_node_is_empty(&event_list)) {
log_debug("cleanup idle workers");
- worker_kill(udev);
+ worker_kill();
}
/* check for hanging events */
- udev_list_node_foreach(loop, &worker_list) {
- struct worker *worker = node_to_worker(loop);
+ HASHMAP_FOREACH(worker, workers, j) {
+ struct event *event = worker->event;
usec_t ts;
if (worker->state != WORKER_RUNNING)
continue;
+ assert(event);
+
ts = now(CLOCK_MONOTONIC);
- if ((ts - worker->event_start_usec) > arg_event_timeout_warn_usec) {
- if ((ts - worker->event_start_usec) > arg_event_timeout_usec) {
- log_error("worker ["PID_FMT"] %s timeout; kill it", worker->pid, worker->event->devpath);
+ if ((ts - event->start_usec) > arg_event_timeout_warn_usec) {
+ if ((ts - event->start_usec) > arg_event_timeout_usec) {
+ log_error("worker ["PID_FMT"] %s timeout; kill it", worker->pid, event->devpath);
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
- log_error("seq %llu '%s' killed", udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
- worker->event->exitcode = -64;
- } else if (!worker->event_warned) {
- log_warning("worker ["PID_FMT"] %s is taking a long time", worker->pid, worker->event->devpath);
- worker->event_warned = true;
+ log_error("seq %llu '%s' killed", udev_device_get_seqnum(event->dev), event->devpath);
+ } else if (!event->warned) {
+ log_warning("worker ["PID_FMT"] %s is taking a long time", worker->pid, event->devpath);
+ event->warned = true;
}
}
}
@@ -1466,7 +1460,7 @@ int main(int argc, char *argv[]) {
/* reload requested, HUP signal received, rules changed, builtin changed */
if (reload) {
- worker_kill(udev);
+ worker_kill();
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
reload = false;
@@ -1526,32 +1520,22 @@ int main(int argc, char *argv[]) {
continue;
}
- /* 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
* "change" events by the inotify device node watch.
- *
- * A single time we may receive a client connection which we need to
- * keep open to block the client. It will be closed right before we
- * exit.
*/
if (is_ctrl)
- ctrl_conn = handle_ctrl_msg(udev_ctrl);
+ handle_ctrl_msg(udev_ctrl);
}
- rc = EXIT_SUCCESS;
exit:
udev_ctrl_cleanup(udev_ctrl);
unlink(UDEV_ROOT_RUN "/udev/queue");
-exit_daemonize:
+
if (fd_ep >= 0)
close(fd_ep);
- worker_list_cleanup(udev);
+ workers_free();
event_queue_cleanup(udev, EVENT_UNDEF);
udev_rules_unref(rules);
udev_builtin_exit(udev);
@@ -1562,10 +1546,10 @@ exit_daemonize:
if (worker_watch[WRITE_END] >= 0)
close(worker_watch[WRITE_END]);
udev_monitor_unref(monitor);
- udev_ctrl_connection_unref(ctrl_conn);
+ udev_ctrl_connection_unref(udev_ctrl_conn);
udev_ctrl_unref(udev_ctrl);
mac_selinux_finish();
udev_unref(udev);
log_close();
- return rc;
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-10-12 15:15:08 +0000