X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=3adedac0807b722cd9c9b38dc665387feff33de0;hp=45e9aae7717ff23ff6ead8ae54db5318f0ee16ed;hb=c7c00276f6f26ff7f38e99d887137bc1f172a978;hpb=9824e9a76426eef53713349c0464e9d1411e3b66 diff --git a/udevd.c b/udevd.c index 45e9aae77..3adedac08 100644 --- a/udevd.c +++ b/udevd.c @@ -1,10 +1,7 @@ /* - * udevd.c - event listener and serializer - * * Copyright (C) 2004-2006 Kay Sievers * Copyright (C) 2004 Chris Friesen * - * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation version 2 of the License. @@ -16,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -32,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +43,10 @@ #include "udev.h" #include "udev_rules.h" #include "udevd.h" +#include "udev_selinux.h" + +static int debug_trace; +static int verbose; static struct udev_rules rules; static int udevd_sock = -1; @@ -77,7 +79,15 @@ void log_message(int priority, const char *format, ...) va_start(args, format); vsyslog(priority, format, args); va_end(args); + + if (verbose) { + va_start(args, format); + vprintf(format, args); + va_end(args); + printf("\n"); + } } + #endif static void asmlinkage udev_event_sig_handler(int signum) @@ -118,7 +128,7 @@ static int udev_event_process(struct udevd_uevent_msg *msg) if (udev == NULL) return -1; strlcpy(udev->action, msg->action, sizeof(udev->action)); - sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem); + sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem, msg->driver); udev->devt = msg->devt; retval = udev_device_event(&rules, udev); @@ -157,9 +167,9 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st { char filename[PATH_SIZE]; char filename_failed[PATH_SIZE]; - char target[PATH_SIZE]; size_t start, end, i; struct udevd_uevent_msg *loop_msg; + int fd; /* add location of queue files */ strlcpy(filename, udev_root, sizeof(filename)); @@ -191,11 +201,10 @@ static void export_event_state(struct udevd_uevent_msg *msg, enum event_state st case EVENT_QUEUED: unlink(filename_failed); delete_path(filename_failed); - - strlcpy(target, sysfs_path, sizeof(target)); - strlcat(target, msg->devpath, sizeof(target)); create_path(filename); - symlink(target, filename); + fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); + if (fd > 0) + close(fd); return; case EVENT_FINISHED: case EVENT_FAILED: @@ -299,6 +308,15 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg) export_event_state(msg, EVENT_QUEUED); + /* run one event after the other in debug mode */ + if (debug_trace) { + list_add_tail(&msg->node, &running_list); + udev_event_run(msg); + waitpid(msg->pid, NULL, 0); + msg_queue_delete(msg); + return; + } + /* run all events with a timeout set immediately */ if (msg->timeout != 0) { list_add_tail(&msg->node, &running_list); @@ -310,7 +328,68 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg) run_exec_q = 1; } -/* runs event and removes event from run queue when finished */ +static int mem_size_mb(void) +{ + int f; + char buf[8192]; + long int len; + const char *pos; + long int memsize; + + f = open("/proc/meminfo", O_RDONLY); + if (f == -1) + return -1; + + len = read(f, buf, sizeof(buf)-1); + close(f); + + if (len <= 0) + return -1; + buf[len] = '\0'; + + pos = strstr(buf, "MemTotal: "); + if (pos == NULL) + return -1; + + if (sscanf(pos, "MemTotal: %ld kB", &memsize) != 1) + return -1; + + return memsize / 1024; +} + +static int cpu_count(void) +{ + int f; + char buf[32768]; + int len; + const char *pos; + int count = 0; + + f = open("/proc/stat", O_RDONLY); + if (f == -1) + return -1; + + len = read(f, buf, sizeof(buf)-1); + close(f); + if (len <= 0) + return -1; + buf[len] = '\0'; + + pos = strstr(buf, "cpu"); + if (pos == NULL) + return -1; + + while (pos != NULL) { + if (strncmp(pos, "cpu", 3) == 0 &&isdigit(pos[3])) + count++; + pos = strstr(&pos[3], "cpu"); + } + + if (count == 0) + return -1; + return count; +} + static int running_processes(void) { int f; @@ -325,11 +404,9 @@ static int running_processes(void) len = read(f, buf, sizeof(buf)-1); close(f); - if (len <= 0) return -1; - else - buf[len] = '\0'; + buf[len] = '\0'; pos = strstr(buf, "procs_running "); if (pos == NULL) @@ -506,8 +583,9 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz int bufpos; int i; struct udevd_uevent_msg *msg; - int major = 0; - int minor = 0; + char *physdevdriver_key = NULL; + int maj = 0; + int min = 0; msg = malloc(sizeof(struct udevd_uevent_msg) + buf_size); if (msg == NULL) @@ -534,19 +612,30 @@ static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_siz msg->devpath = &key[8]; else if (strncmp(key, "SUBSYSTEM=", 10) == 0) msg->subsystem = &key[10]; + else if (strncmp(key, "DRIVER=", 7) == 0) + msg->driver = &key[7]; else if (strncmp(key, "SEQNUM=", 7) == 0) msg->seqnum = strtoull(&key[7], NULL, 10); else if (strncmp(key, "PHYSDEVPATH=", 12) == 0) msg->physdevpath = &key[12]; + else if (strncmp(key, "PHYSDEVDRIVER=", 14) == 0) + physdevdriver_key = key; else if (strncmp(key, "MAJOR=", 6) == 0) - major = strtoull(&key[6], NULL, 10); + maj = strtoull(&key[6], NULL, 10); else if (strncmp(key, "MINOR=", 6) == 0) - minor = strtoull(&key[6], NULL, 10); + min = strtoull(&key[6], NULL, 10); else if (strncmp(key, "TIMEOUT=", 8) == 0) msg->timeout = strtoull(&key[8], NULL, 10); } - msg->devt = makedev(major, minor); + msg->devt = makedev(maj, min); msg->envp[i++] = "UDEVD_EVENT=1"; + + if (msg->driver == NULL && msg->physdevpath == NULL && physdevdriver_key != NULL) { + /* for older kernels DRIVER is empty for a bus device, export PHYSDEVDRIVER as DRIVER */ + msg->envp[i++] = &physdevdriver_key[7]; + msg->driver = &physdevdriver_key[14]; + } + msg->envp[i] = NULL; if (msg->devpath == NULL || msg->action == NULL) { @@ -625,12 +714,17 @@ static void get_ctrl_msg(void) info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval); max_childs = *intval; break; + case UDEVD_CTRL_SET_MAX_CHILDS_RUNNING: + intval = (int *) ctrl_msg.buf; + info("udevd message (UDEVD_SET_MAX_CHILDS_RUNNING) received, max_childs=%i", *intval); + max_childs_running = *intval; + break; case UDEVD_CTRL_RELOAD_RULES: info("udevd message (RELOAD_RULES) received"); reload_config = 1; break; default: - dbg("unknown message type"); + err("unknown control message type"); } } @@ -746,7 +840,6 @@ static void reap_sigchilds(void) static int init_udevd_socket(void) { struct sockaddr_un saddr; - const int buffersize = 16 * 1024 * 1024; socklen_t addrlen; const int feature_on = 1; int retval; @@ -763,9 +856,6 @@ static int init_udevd_socket(void) return -1; } - /* set receive buffersize */ - setsockopt(udevd_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize)); - /* the bind takes care of ensuring only one copy running */ retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen); if (retval < 0) { @@ -847,63 +937,76 @@ int main(int argc, char *argv[], char *envp[]) fd_set readfds; const char *value; int daemonize = 0; - int i; - int rc = 0; + int option; + static const struct option options[] = { + { "daemon", 0, NULL, 'd' }, + { "debug-trace", 0, NULL, 't' }, + { "verbose", 0, NULL, 'v' }, + { "help", 0, NULL, 'h' }, + {} + }; + int rc = 1; int maxfd; - /* redirect std fd's, if the kernel forks us, we don't have them at all */ - fd = open("/dev/null", O_RDWR); - if (fd >= 0) { - if (fd != STDIN_FILENO) - dup2(fd, STDIN_FILENO); - if (fd != STDOUT_FILENO) - dup2(fd, STDOUT_FILENO); - if (fd != STDERR_FILENO) - dup2(fd, STDERR_FILENO); - if (fd > STDERR_FILENO) - close(fd); - } - logging_init("udevd"); - if (fd < 0) - err("fatal, could not open /dev/null: %s", strerror(errno)); - udev_config_init(); + selinux_init(); dbg("version %s", UDEV_VERSION); - if (getuid() != 0) { - err("need to be root, exit"); - goto exit; - } - /* parse commandline options */ - for (i = 1 ; i < argc; i++) { - char *arg = argv[i]; - if (strcmp(arg, "--daemon") == 0 || strcmp(arg, "-d") == 0) { - info("will daemonize"); + while (1) { + option = getopt_long(argc, argv, "dtvh", options, NULL); + if (option == -1) + break; + + switch (option) { + case 'd': daemonize = 1; + break; + case 't': + debug_trace = 1; + break; + case 'v': + verbose = 1; + if (udev_log_priority < LOG_INFO) + udev_log_priority = LOG_INFO; + break; + case 'h': + printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose]\n"); + goto exit; + default: + goto exit; } } + if (getuid() != 0) { + fprintf(stderr, "root privileges required\n"); + err("root privileges required"); + goto exit; + } + /* init sockets to receive events */ if (init_udevd_socket() < 0) { if (errno == EADDRINUSE) { - err("another udevd running, exit"); + fprintf(stderr, "another udev daemon already running\n"); + err("another udev daemon already running"); rc = 1; } else { - err("error initializing udevd socket: %s", strerror(errno)); + fprintf(stderr, "error initializing udevd socket\n"); + err("error initializing udevd socket"); rc = 2; } goto exit; } if (init_uevent_netlink_sock() < 0) { - err("uevent socket not available"); + fprintf(stderr, "error initializing netlink socket\n"); + err("error initializing netlink socket"); rc = 3; goto exit; } - /* parse the rules and keep it in memory */ + /* parse the rules and keep them in memory */ sysfs_init(); udev_rules_init(&rules, 1); @@ -923,10 +1026,23 @@ int main(int argc, char *argv[], char *envp[]) goto exit; default: dbg("child [%u] running, parent exits", pid); + rc = 0; goto exit; } } + /* redirect std fd's */ + fd = open("/dev/null", O_RDWR); + if (fd >= 0) { + dup2(fd, STDIN_FILENO); + if (!verbose) + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); + if (fd > STDERR_FILENO) + close(fd); + } else + err("error opening /dev/null: %s", strerror(errno)); + /* set scheduling priority for the daemon */ setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY); @@ -998,16 +1114,26 @@ int main(int argc, char *argv[], char *envp[]) value = getenv("UDEVD_MAX_CHILDS"); if (value) max_childs = strtoul(value, NULL, 10); - else - max_childs = UDEVD_MAX_CHILDS; + else { + int memsize = mem_size_mb(); + if (memsize > 0) + max_childs = 128 + (memsize / 4); + else + max_childs = UDEVD_MAX_CHILDS; + } info("initialize max_childs to %u", max_childs); /* start to throttle forking if maximum number of _running_ childs is reached */ value = getenv("UDEVD_MAX_CHILDS_RUNNING"); if (value) max_childs_running = strtoull(value, NULL, 10); - else - max_childs_running = UDEVD_MAX_CHILDS_RUNNING; + else { + int cpus = cpu_count(); + if (cpus > 0) + max_childs_running = 8 + (8 * cpus); + else + max_childs_running = UDEVD_MAX_CHILDS_RUNNING; + } info("initialize max_childs_running to %u", max_childs_running); /* clear environment for forked event processes */ @@ -1016,6 +1142,8 @@ int main(int argc, char *argv[], char *envp[]) /* export log_priority , as called programs may want to follow that setting */ sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority); putenv(udev_log); + if (debug_trace) + putenv("DEBUG=1"); maxfd = udevd_sock; maxfd = UDEV_MAX(maxfd, uevent_netlink_sock); @@ -1078,7 +1206,7 @@ int main(int argc, char *argv[], char *envp[]) } } - /* rules changed, set by inotify or a signal*/ + /* rules changed, set by inotify or a HUP signal */ if (reload_config) { reload_config = 0; udev_rules_cleanup(&rules); @@ -1097,6 +1225,7 @@ int main(int argc, char *argv[], char *envp[]) msg_queue_manager(); } } + rc = 0; exit: udev_rules_cleanup(&rules);