/*
- * Copyright (C) 2004-2011 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2012 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
* Copyright (C) 2009 Canonical Ltd.
* Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
#include "udev.h"
#include "sd-daemon.h"
+#include "cgroup-util.h"
+#include "dev-setup.h"
static bool debug;
const char *file, int line, const char *fn,
const char *format, va_list args)
{
- if (debug) {
- char buf[1024];
- struct timespec ts;
-
- vsnprintf(buf, sizeof(buf), format, args);
- clock_gettime(CLOCK_MONOTONIC, &ts);
- fprintf(stderr, "[%llu.%06u] [%u] %s: %s",
- (unsigned long long) ts.tv_sec, (unsigned int) ts.tv_nsec/1000,
- (int) getpid(), fn, buf);
- } else {
- vsyslog(priority, format, args);
- }
+ log_metav(priority, file, line, fn, format, args);
}
static struct udev_rules *rules;
static sigset_t sigmask_orig;
static UDEV_LIST(event_list);
static UDEV_LIST(worker_list);
+char *udev_cgroup;
static bool udev_exit;
enum event_state {
int ifindex;
};
-static struct event *node_to_event(struct udev_list_node *node)
+static inline struct event *node_to_event(struct udev_list_node *node)
{
- char *event;
-
- event = (char *)node;
- event -= offsetof(struct event, node);
- return (struct event *)event;
+ return container_of(node, struct event, node);
}
static void event_queue_cleanup(struct udev *udev, enum event_state type);
int exitcode;
};
-static struct worker *node_to_worker(struct udev_list_node *node)
+static inline struct worker *node_to_worker(struct udev_list_node *node)
{
- char *worker;
-
- worker = (char *)node;
- worker -= offsetof(struct worker, node);
- return (struct worker *)worker;
+ return container_of(node, struct worker, node);
}
static void event_queue_delete(struct event *event, bool export)
if (export) {
udev_queue_export_device_finished(udev_queue_export, event->dev);
- info(event->udev, "seq %llu done with %i\n", udev_device_get_seqnum(event->dev), event->exitcode);
+ log_debug("seq %llu done with %i\n", udev_device_get_seqnum(event->dev), event->exitcode);
}
udev_device_unref(event->dev);
free(event);
worker->refcount--;
if (worker->refcount > 0)
return;
- info(worker->udev, "worker [%u] cleaned up\n", worker->pid);
+ log_debug("worker [%u] cleaned up\n", worker->pid);
worker_cleanup(worker);
}
sigfillset(&mask);
fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
if (fd_signal < 0) {
- err(udev, "error creating signalfd %m\n");
+ log_error("error creating signalfd %m\n");
rc = 2;
goto out;
}
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- err(udev, "error creating epoll fd: %m\n");
+ log_error("error creating epoll fd: %m\n");
rc = 3;
goto out;
}
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) {
- err(udev, "fail to add fds to epoll: %m\n");
+ log_error("fail to add fds to epoll: %m\n");
rc = 4;
goto out;
}
struct worker_message msg;
int err;
- info(udev, "seq %llu running\n", udev_device_get_seqnum(dev));
+ log_debug("seq %llu running\n", udev_device_get_seqnum(dev));
udev_event = udev_event_new(dev);
if (udev_event == NULL) {
rc = 5;
msg.pid = getpid();
send(worker_watch[WRITE_END], &msg, sizeof(struct worker_message), 0);
- info(udev, "seq %llu processed with %i\n", udev_device_get_seqnum(dev), err);
+ log_debug("seq %llu processed with %i\n", udev_device_get_seqnum(dev), err);
udev_device_unref(dev);
dev = NULL;
int fdcount;
int i;
- fdcount = epoll_wait(fd_ep, ev, ARRAY_SIZE(ev), -1);
+ fdcount = epoll_wait(fd_ep, ev, ELEMENTSOF(ev), -1);
if (fdcount < 0) {
if (errno == EINTR)
continue;
- err = -errno;
- err(udev, "failed to poll: %m\n");
+ log_error("failed to poll: %m\n");
goto out;
}
udev_builtin_exit(udev);
udev_monitor_unref(worker_monitor);
udev_unref(udev);
- udev_log_close();
+ log_close();
exit(rc);
}
case -1:
udev_monitor_unref(worker_monitor);
event->state = EVENT_QUEUED;
free(worker);
- err(udev, "fork of child failed: %m\n");
+ log_error("fork of child failed: %m\n");
break;
default:
/* close monitor, but keep address around */
event->state = EVENT_RUNNING;
udev_list_node_append(&worker->node, &worker_list);
children++;
- info(udev, "seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
+ log_debug("seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
break;
}
}
count = udev_monitor_send_device(monitor, worker->monitor, event->dev);
if (count < 0) {
- err(event->udev, "worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
+ log_error("worker [%u] did not accept message %zi (%m), kill it\n", worker->pid, count);
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
continue;
if (children >= children_max) {
if (children_max > 1)
- info(event->udev, "maximum number (%i) of children reached\n", children);
+ log_debug("maximum number (%i) of children reached\n", children);
return;
}
event->ifindex = udev_device_get_ifindex(dev);
udev_queue_export_device_queued(udev_queue_export, dev);
- info(event->udev, "seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
+ log_debug("seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
udev_device_get_action(dev), udev_device_get_subsystem(dev));
event->state = EVENT_QUEUED;
return 0;
}
-static void worker_kill(struct udev *udev, int retain)
+static void worker_kill(struct udev *udev)
{
struct udev_list_node *loop;
- int max;
-
- if (children <= retain)
- return;
-
- max = children - retain;
udev_list_node_foreach(loop, &worker_list) {
struct worker *worker = node_to_worker(loop);
- if (max-- <= 0)
- break;
-
if (worker->state == WORKER_KILLED)
continue;
continue;
/* do not start event if parent or child event is still running */
- if (is_devpath_busy(event)) {
- dbg(udev, "delay seq %llu (%s)\n", event->seqnum, event->devpath);
+ if (is_devpath_busy(event))
continue;
- }
event_run(event);
}
i = udev_ctrl_get_set_log_level(ctrl_msg);
if (i >= 0) {
- info(udev, "udevd message (SET_LOG_PRIORITY) received, log_priority=%i\n", i);
+ log_debug("udevd message (SET_LOG_PRIORITY) received, log_priority=%i\n", i);
+ log_set_max_level(i);
udev_set_log_priority(udev, i);
- worker_kill(udev, 0);
+ worker_kill(udev);
}
if (udev_ctrl_get_stop_exec_queue(ctrl_msg) > 0) {
- info(udev, "udevd message (STOP_EXEC_QUEUE) received\n");
+ log_debug("udevd message (STOP_EXEC_QUEUE) received\n");
stop_exec_queue = true;
}
if (udev_ctrl_get_start_exec_queue(ctrl_msg) > 0) {
- info(udev, "udevd message (START_EXEC_QUEUE) received\n");
+ log_debug("udevd message (START_EXEC_QUEUE) received\n");
stop_exec_queue = false;
}
if (udev_ctrl_get_reload(ctrl_msg) > 0) {
- info(udev, "udevd message (RELOAD) received\n");
+ log_debug("udevd message (RELOAD) received\n");
reload = true;
}
val[0] = '\0';
val = &val[1];
if (val[0] == '\0') {
- info(udev, "udevd message (ENV) received, unset '%s'\n", key);
+ log_debug("udevd message (ENV) received, unset '%s'\n", key);
udev_add_property(udev, key, NULL);
} else {
- info(udev, "udevd message (ENV) received, set '%s=%s'\n", key, val);
+ log_debug("udevd message (ENV) received, set '%s=%s'\n", key, val);
udev_add_property(udev, key, val);
}
} else {
- err(udev, "wrong key format '%s'\n", key);
+ log_error("wrong key format '%s'\n", key);
}
free(key);
}
- worker_kill(udev, 0);
+ worker_kill(udev);
}
i = udev_ctrl_get_set_children_max(ctrl_msg);
if (i >= 0) {
- info(udev, "udevd message (SET_MAX_CHILDREN) received, children_max=%i\n", i);
+ log_debug("udevd message (SET_MAX_CHILDREN) received, children_max=%i\n", i);
children_max = i;
}
if (udev_ctrl_get_ping(ctrl_msg) > 0)
- info(udev, "udevd message (SYNC) received\n");
+ log_debug("udevd message (SYNC) received\n");
if (udev_ctrl_get_exit(ctrl_msg) > 0) {
- info(udev, "udevd message (EXIT) received\n");
+ log_debug("udevd message (EXIT) received\n");
udev_exit = true;
/* keep reference to block the client until we exit */
udev_ctrl_connection_ref(ctrl_conn);
buf = malloc(nbytes);
if (buf == NULL) {
- err(udev, "error getting buffer for inotify\n");
+ log_error("error getting buffer for inotify\n");
return -1;
}
ev = (struct inotify_event *)(buf + pos);
dev = udev_watch_lookup(udev, ev->wd);
if (dev != NULL) {
- info(udev, "inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
+ log_debug("inotify event: %x for %s\n", ev->mask, udev_device_get_devnode(dev));
if (ev->mask & IN_CLOSE_WRITE) {
char filename[UTIL_PATH_SIZE];
int fd;
- info(udev, "device %s closed, synthesising 'change'\n", udev_device_get_devnode(dev));
+ log_debug("device %s closed, synthesising 'change'\n", udev_device_get_devnode(dev));
util_strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
fd = open(filename, O_WRONLY);
if (fd >= 0) {
if (write(fd, "change", 6) < 0)
- info(udev, "error writing uevent: %m\n");
+ log_debug("error writing uevent: %m\n");
close(fd);
}
}
if (worker->pid != pid)
continue;
- info(udev, "worker [%u] exit\n", pid);
+ log_debug("worker [%u] exit\n", pid);
if (WIFEXITED(status)) {
if (WEXITSTATUS(status) != 0)
- err(udev, "worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status));
+ log_error("worker [%u] exit with return code %i\n", pid, WEXITSTATUS(status));
} else if (WIFSIGNALED(status)) {
- err(udev, "worker [%u] terminated by signal %i (%s)\n",
+ log_error("worker [%u] terminated by signal %i (%s)\n",
pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
} else if (WIFSTOPPED(status)) {
- err(udev, "worker [%u] stopped\n", pid);
+ log_error("worker [%u] stopped\n", pid);
} else if (WIFCONTINUED(status)) {
- err(udev, "worker [%u] continued\n", pid);
+ log_error("worker [%u] continued\n", pid);
} else {
- err(udev, "worker [%u] exit with status 0x%04x\n", pid, status);
+ log_error("worker [%u] exit with status 0x%04x\n", pid, status);
}
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
if (worker->event) {
- err(udev, "worker [%u] failed while handling '%s'\n",
- pid, worker->event->devpath);
+ log_error("worker [%u] failed while handling '%s'\n",
+ pid, worker->event->devpath);
worker->event->exitcode = -32;
event_queue_delete(worker->event, true);
/* drop reference taken for state 'running' */
else
continue;
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/", devname, NULL);
- util_create_path_selinux(udev, filename);
- udev_selinux_setfscreatecon(udev, filename, mode);
- info(udev, "mknod '%s' %c%u:%u\n", filename, type, maj, min);
+ util_strscpyl(filename, sizeof(filename), "/dev/", devname, NULL);
+ mkdir_parents(filename, 0755);
+ label_context_set(filename, mode);
+ log_debug("mknod '%s' %c%u:%u\n", filename, type, maj, min);
if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST)
utimensat(AT_FDCWD, filename, NULL, 0);
- udev_selinux_resetfscreatecon(udev);
+ label_context_clear();
}
fclose(f);
}
-static int copy_dev_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth)
-{
- struct dirent *dent;
-
- for (dent = readdir(dir_from); dent != NULL; dent = readdir(dir_from)) {
- struct stat stats;
-
- if (dent->d_name[0] == '.')
- continue;
- if (fstatat(dirfd(dir_from), dent->d_name, &stats, AT_SYMLINK_NOFOLLOW) != 0)
- continue;
-
- if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) {
- udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, stats.st_mode & 0777);
- if (mknodat(dirfd(dir_to), dent->d_name, stats.st_mode, stats.st_rdev) == 0) {
- fchmodat(dirfd(dir_to), dent->d_name, stats.st_mode & 0777, 0);
- fchownat(dirfd(dir_to), dent->d_name, stats.st_uid, stats.st_gid, 0);
- } else {
- utimensat(dirfd(dir_to), dent->d_name, NULL, 0);
- }
- udev_selinux_resetfscreatecon(udev);
- } else if (S_ISLNK(stats.st_mode)) {
- char target[UTIL_PATH_SIZE];
- ssize_t len;
-
- len = readlinkat(dirfd(dir_from), dent->d_name, target, sizeof(target));
- if (len <= 0 || len == (ssize_t)sizeof(target))
- continue;
- target[len] = '\0';
- udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, S_IFLNK);
- if (symlinkat(target, dirfd(dir_to), dent->d_name) < 0 && errno == EEXIST)
- utimensat(dirfd(dir_to), dent->d_name, NULL, AT_SYMLINK_NOFOLLOW);
- udev_selinux_resetfscreatecon(udev);
- } else if (S_ISDIR(stats.st_mode)) {
- DIR *dir2_from, *dir2_to;
-
- if (maxdepth == 0)
- continue;
-
- udev_selinux_setfscreateconat(udev, dirfd(dir_to), dent->d_name, S_IFDIR|0755);
- mkdirat(dirfd(dir_to), dent->d_name, 0755);
- udev_selinux_resetfscreatecon(udev);
-
- dir2_to = fdopendir(openat(dirfd(dir_to), dent->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
- if (dir2_to == NULL)
- continue;
-
- dir2_from = fdopendir(openat(dirfd(dir_from), dent->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC));
- if (dir2_from == NULL) {
- closedir(dir2_to);
- continue;
- }
-
- copy_dev_dir(udev, dir2_from, dir2_to, maxdepth-1);
-
- closedir(dir2_to);
- closedir(dir2_from);
- }
- }
-
- return 0;
-}
-
-static void static_dev_create_links(struct udev *udev, DIR *dir)
-{
- struct stdlinks {
- const char *link;
- const char *target;
- };
- static const struct stdlinks stdlinks[] = {
- { "core", "/proc/kcore" },
- { "fd", "/proc/self/fd" },
- { "stdin", "/proc/self/fd/0" },
- { "stdout", "/proc/self/fd/1" },
- { "stderr", "/proc/self/fd/2" },
- };
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(stdlinks); i++) {
- struct stat sb;
-
- if (stat(stdlinks[i].target, &sb) == 0) {
- udev_selinux_setfscreateconat(udev, dirfd(dir), stdlinks[i].link, S_IFLNK);
- if (symlinkat(stdlinks[i].target, dirfd(dir), stdlinks[i].link) < 0 && errno == EEXIST)
- utimensat(dirfd(dir), stdlinks[i].link, NULL, AT_SYMLINK_NOFOLLOW);
- udev_selinux_resetfscreatecon(udev);
- }
- }
-}
-
-static void static_dev_create_from_devices(struct udev *udev, DIR *dir)
-{
- DIR *dir_from;
-
- dir_from = opendir(UDEVLIBEXECDIR "/devices");
- if (dir_from == NULL)
- return;
- copy_dev_dir(udev, dir_from, dir, 8);
- closedir(dir_from);
-}
-
-static void static_dev_create(struct udev *udev)
-{
- DIR *dir;
-
- dir = opendir(udev_get_dev_path(udev));
- if (dir == NULL)
- return;
-
- static_dev_create_links(udev, dir);
- static_dev_create_from_devices(udev, dir);
-
- closedir(dir);
-}
-
static int mem_size_mb(void)
{
FILE *f;
struct udev_list_entry *list_entry;
/* current database */
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/data", NULL);
- if (access(filename, F_OK) >= 0)
+ if (access("/run/udev/data", F_OK) >= 0)
return 0;
/* make sure we do not get here again */
- util_create_path(udev, filename);
+ mkdir_parents("/run/udev/data", 0755);
mkdir(filename, 0755);
/* old database */
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db", NULL);
+ util_strscpyl(filename, sizeof(filename), "/dev/.udev/db", NULL);
if (access(filename, F_OK) < 0)
return 0;
/* find database in old location */
id = udev_device_get_id_filename(device);
- util_strscpyl(from, sizeof(from), udev_get_dev_path(udev), "/.udev/db/", id, NULL);
+ util_strscpyl(from, sizeof(from), "/dev/.udev/db/", id, NULL);
if (lstat(from, &stats) == 0) {
if (!have_db) {
udev_device_read_db(device, from);
}
/* find old database with $subsys:$sysname name */
- util_strscpyl(from, sizeof(from), udev_get_dev_path(udev),
- "/.udev/db/", udev_device_get_subsystem(device), ":",
- udev_device_get_sysname(device), NULL);
+ util_strscpyl(from, sizeof(from), "/dev/.udev/db/",
+ udev_device_get_subsystem(device), ":", udev_device_get_sysname(device), NULL);
if (lstat(from, &stats) == 0) {
if (!have_db) {
udev_device_read_db(device, from);
/* find old database with the encoded devpath name */
util_path_encode(udev_device_get_devpath(device), devpath, sizeof(devpath));
- util_strscpyl(from, sizeof(from), udev_get_dev_path(udev), "/.udev/db/", devpath, NULL);
+ util_strscpyl(from, sizeof(from), "/dev/.udev/db/", devpath, NULL);
if (lstat(from, &stats) == 0) {
if (!have_db) {
udev_device_read_db(device, from);
if (ctrl < 0 || netlink < 0)
return -1;
- info(udev, "ctrl=%i netlink=%i\n", ctrl, netlink);
+ log_debug("ctrl=%i netlink=%i\n", ctrl, netlink);
*rctrl = ctrl;
*rnetlink = netlink;
return 0;
}
-static bool check_rules_timestamp(struct udev *udev)
-{
- char **p;
- unsigned long long *stamp_usec;
- int i, n;
- bool changed = false;
-
- n = udev_get_rules_path(udev, &p, &stamp_usec);
- for (i = 0; i < n; i++) {
- struct stat stats;
-
- if (stat(p[i], &stats) < 0)
- continue;
-
- if (stamp_usec[i] == ts_usec(&stats.st_mtim))
- continue;
-
- /* first check */
- if (stamp_usec[i] != 0) {
- info(udev, "reload - timestamp of '%s' changed\n", p[i]);
- changed = true;
- }
-
- /* update timestamp */
- stamp_usec[i] = ts_usec(&stats.st_mtim);
- }
-
- return changed;
-}
-
int main(int argc, char *argv[])
{
struct udev *udev;
int fd_worker = -1;
struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker;
struct udev_ctrl_connection *ctrl_conn = NULL;
- char **s;
int rc = 1;
udev = udev_new();
if (udev == NULL)
goto exit;
- udev_log_init("udevd");
+ log_open();
+ log_parse_environment();
udev_set_log_fn(udev, udev_main_log);
- info(udev, "version %s\n", VERSION);
- udev_selinux_init(udev);
+ log_debug("version %s\n", VERSION);
+ label_init("/dev");
for (;;) {
int option;
break;
case 'D':
debug = true;
- if (udev_get_log_priority(udev) < LOG_INFO)
- udev_set_log_priority(udev, LOG_INFO);
+ log_set_max_level(LOG_DEBUG);
+ udev_set_log_priority(udev, LOG_INFO);
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
resolve_names = -1;
} else {
fprintf(stderr, "resolve-names must be early, late or never\n");
- err(udev, "resolve-names must be early, late or never\n");
+ log_error("resolve-names must be early, late or never\n");
goto exit;
}
break;
if (getuid() != 0) {
fprintf(stderr, "root privileges required\n");
- err(udev, "root privileges required\n");
+ log_error("root privileges required\n");
goto exit;
}
chdir("/");
umask(022);
- /* /run/udev */
- mkdir(udev_get_run_path(udev), 0755);
+ mkdir("/run/udev", 0755);
- /* create standard links, copy static nodes, create nodes from modules */
- static_dev_create(udev);
+ dev_setup();
static_dev_create_from_modules(udev);
/* before opening new files, make sure std{in,out,err} fds are in a sane state */
close(fd);
} else {
fprintf(stderr, "cannot open /dev/null\n");
- err(udev, "cannot open /dev/null\n");
+ log_error("cannot open /dev/null\n");
}
}
/* get control and netlink socket from from systemd */
udev_ctrl = udev_ctrl_new_from_fd(udev, fd_ctrl);
if (udev_ctrl == NULL) {
- err(udev, "error taking over udev control socket");
+ log_error("error taking over udev control socket");
rc = 1;
goto exit;
}
monitor = udev_monitor_new_from_netlink_fd(udev, "kernel", fd_netlink);
if (monitor == NULL) {
- err(udev, "error taking over netlink socket\n");
+ log_error("error taking over netlink socket\n");
rc = 3;
goto exit;
}
+
+ /* get our own cgroup, we regularly kill everything udev has left behind */
+ if (cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, &udev_cgroup) < 0)
+ udev_cgroup = NULL;
} else {
/* open control and netlink socket */
udev_ctrl = udev_ctrl_new(udev);
if (udev_ctrl == NULL) {
fprintf(stderr, "error initializing udev control socket");
- err(udev, "error initializing udev control socket");
+ log_error("error initializing udev control socket");
rc = 1;
goto exit;
}
monitor = udev_monitor_new_from_netlink(udev, "kernel");
if (monitor == NULL) {
fprintf(stderr, "error initializing netlink socket\n");
- err(udev, "error initializing netlink socket\n");
+ log_error("error initializing netlink socket\n");
rc = 3;
goto exit;
}
if (udev_monitor_enable_receiving(monitor) < 0) {
fprintf(stderr, "error binding netlink socket\n");
- err(udev, "error binding netlink socket\n");
+ log_error("error binding netlink socket\n");
rc = 3;
goto exit;
}
if (udev_ctrl_enable_receiving(udev_ctrl) < 0) {
fprintf(stderr, "error binding udev control socket\n");
- err(udev, "error binding udev control socket\n");
+ log_error("error binding udev control socket\n");
rc = 1;
goto exit;
}
/* create queue file before signalling 'ready', to make sure we block 'settle' */
udev_queue_export = udev_queue_export_new(udev);
if (udev_queue_export == NULL) {
- err(udev, "error creating queue file\n");
+ log_error("error creating queue file\n");
goto exit;
}
case 0:
break;
case -1:
- err(udev, "fork of daemon failed: %m\n");
+ log_error("fork of daemon failed: %m\n");
rc = 4;
goto exit;
default:
setsid();
- fd = open("/proc/self/oom_score_adj", O_RDWR);
- if (fd < 0) {
- /* Fallback to old interface */
- fd = open("/proc/self/oom_adj", O_RDWR);
- if (fd < 0) {
- err(udev, "error disabling OOM: %m\n");
- } else {
- /* OOM_DISABLE == -17 */
- write(fd, "-17", 3);
- close(fd);
- }
- } else {
+ fd = open("/proc/self/oom_score_adj", O_RDWR|O_CLOEXEC);
+ if (fd >= 0) {
write(fd, "-1000", 5);
close(fd);
}
fd_inotify = udev_watch_init(udev);
if (fd_inotify < 0) {
fprintf(stderr, "error initializing inotify\n");
- err(udev, "error initializing inotify\n");
+ log_error("error initializing inotify\n");
rc = 4;
goto exit;
}
fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
if (fd_signal < 0) {
fprintf(stderr, "error creating signalfd\n");
- err(udev, "error creating signalfd\n");
+ log_error("error creating signalfd\n");
rc = 5;
goto exit;
}
/* 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");
- err(udev, "error creating socketpair\n");
+ log_error("error creating socketpair\n");
rc = 6;
goto exit;
}
rules = udev_rules_new(udev, resolve_names);
if (rules == NULL) {
- err(udev, "error reading rules\n");
+ log_error("error reading rules\n");
goto exit;
}
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- err(udev, "error creating epoll fd: %m\n");
+ log_error("error creating epoll fd: %m\n");
goto exit;
}
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_ctrl, &ep_ctrl) < 0 ||
epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_signal, &ep_signal) < 0 ||
epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_netlink, &ep_netlink) < 0 ||
epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_worker, &ep_worker) < 0) {
- err(udev, "fail to add fds to epoll: %m\n");
+ log_error("fail to add fds to epoll: %m\n");
goto exit;
}
else
children_max = 128;
}
- info(udev, "set children_max to %u\n", children_max);
+ log_debug("set children_max to %u\n", children_max);
udev_rules_apply_static_dev_perms(rules);
/* discard queued events and kill workers */
event_queue_cleanup(udev, EVENT_QUEUED);
- worker_kill(udev, 0);
+ worker_kill(udev);
/* exit after all has cleaned up */
if (udev_list_node_is_empty(&event_list) && udev_list_node_is_empty(&worker_list))
/* timeout at exit for workers to finish */
timeout = 30 * 1000;
- } else if (udev_list_node_is_empty(&event_list) && children <= 2) {
+ } else if (udev_list_node_is_empty(&event_list) && !children) {
/* we are idle */
timeout = -1;
+
+ /* cleanup possible left-over processes in our cgroup */
+ if (udev_cgroup)
+ cg_kill(SYSTEMD_CGROUP_CONTROLLER, udev_cgroup, SIGKILL, false, true, NULL);
} else {
/* kill idle or hanging workers */
timeout = 3 * 1000;
}
- fdcount = epoll_wait(fd_ep, ev, ARRAY_SIZE(ev), timeout);
+ fdcount = epoll_wait(fd_ep, ev, ELEMENTSOF(ev), timeout);
if (fdcount < 0)
continue;
/* timeout */
if (udev_exit) {
- err(udev, "timeout, giving up waiting for workers to finish\n");
+ log_error("timeout, giving up waiting for workers to finish\n");
break;
}
/* kill idle workers */
if (udev_list_node_is_empty(&event_list)) {
- info(udev, "cleanup idle workers\n");
- worker_kill(udev, 2);
+ log_debug("cleanup idle workers\n");
+ worker_kill(udev);
}
/* check for hanging events */
continue;
if ((now_usec() - worker->event_start_usec) > 30 * 1000 * 1000) {
- err(udev, "worker [%u] timeout, kill it\n", worker->pid,
+ log_error("worker [%u] %s timeout; kill it\n", worker->pid,
worker->event ? worker->event->devpath : "<idle>");
kill(worker->pid, SIGKILL);
worker->state = WORKER_KILLED;
/* drop reference taken for state 'running' */
worker_unref(worker);
if (worker->event) {
- err(udev, "seq %llu '%s' killed\n",
- udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
+ log_error("seq %llu '%s' killed\n",
+ udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
worker->event->exitcode = -64;
event_queue_delete(worker->event, true);
worker->event = NULL;
/* check for changed config, every 3 seconds at most */
if ((now_usec() - last_usec) > 3 * 1000 * 1000) {
- if (check_rules_timestamp(udev))
+ if (udev_rules_check_timestamp(rules))
reload = true;
if (udev_builtin_validate(udev))
reload = true;
/* reload requested, HUP signal received, rules changed, builtin changed */
if (reload) {
- worker_kill(udev, 0);
+ worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
reload = 0;
udev_queue_export_unref(udev_queue_export);
udev_ctrl_connection_unref(ctrl_conn);
udev_ctrl_unref(udev_ctrl);
- udev_selinux_exit(udev);
+ label_finish();
udev_unref(udev);
- udev_log_close();
+ log_close();
return rc;
}
~ianmdlvl / elogind.git / blobdiff