chiark / gitweb /
udevd: export .udev/queue/$seqnum before .udev/uevent_seqnum
[elogind.git] / udevd.c
diff --git a/udevd.c b/udevd.c
index eb1080b190b9372f454370546fbfdf21d52236c2..d6977e9655de8442195c8ba98b9c728c3c452abc 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -1,10 +1,7 @@
 /*
- * udevd.c - event listener and serializer
- *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
  *
- *
  *     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 <fcntl.h>
 #include <syslog.h>
 #include <time.h>
+#include <getopt.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include "udev.h"
 #include "udev_rules.h"
 #include "udevd.h"
+#include "udev_selinux.h"
+
+static int debug_trace;
+static int debug;
 
 static struct udev_rules rules;
-static int udevd_sock;
-static int uevent_netlink_sock;
-static int inotify_fd;
+static int udevd_sock = -1;
+static int uevent_netlink_sock = -1;
+static int inotify_fd = -1;
 static pid_t sid;
 
 static int signal_pipe[2] = {-1, -1};
@@ -75,9 +77,14 @@ void log_message(int priority, const char *format, ...)
                return;
 
        va_start(args, format);
-       vsyslog(priority, format, args);
+       if (debug) {
+               printf("[%d] ", (int) getpid());
+               vprintf(format, args);
+       } else
+               vsyslog(priority, format, args);
        va_end(args);
 }
+
 #endif
 
 static void asmlinkage udev_event_sig_handler(int signum)
@@ -86,7 +93,7 @@ static void asmlinkage udev_event_sig_handler(int signum)
                exit(1);
 }
 
-static int udev_event_process(struct uevent_msg *msg)
+static int udev_event_process(struct udevd_uevent_msg *msg)
 {
        struct sigaction act;
        struct udevice *udev;
@@ -108,40 +115,29 @@ static int udev_event_process(struct uevent_msg *msg)
        sigaction(SIGHUP, &act, NULL);
 
        /* trigger timeout to prevent hanging processes */
-       alarm(UDEV_ALARM_TIMEOUT);
+       alarm(UDEV_EVENT_TIMEOUT);
 
        /* reconstruct event environment from message */
        for (i = 0; msg->envp[i]; i++)
                putenv(msg->envp[i]);
 
-       udev = udev_device_init();
+       udev = udev_device_init(NULL);
        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->devpath_old = msg->devpath_old;
        udev->devt = msg->devt;
 
        retval = udev_device_event(&rules, udev);
 
+       /* rules may change/disable the timeout */
+       if (udev->event_timeout >= 0)
+               alarm(udev->event_timeout);
+
        /* run programs collected by RUN-key*/
-       if (retval == 0 && !udev->ignore_device && udev_run) {
-               struct name_entry *name_loop;
-
-               dbg("executing run list");
-               list_for_each_entry(name_loop, &udev->run_list, node) {
-                       if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
-                               pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
-                       else {
-                               char program[PATH_SIZE];
-
-                               strlcpy(program, name_loop->name, sizeof(program));
-                               udev_rules_apply_format(udev, program, sizeof(program));
-                               if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
-                                               (udev_log_priority >= LOG_INFO)))
-                                       retval = -1;
-                       }
-               }
-       }
+       if (retval == 0 && !udev->ignore_device && udev_run)
+               retval = udev_rules_run(udev);
 
        udev_device_cleanup(udev);
        return retval;
@@ -153,84 +149,72 @@ enum event_state {
        EVENT_FAILED,
 };
 
-static void export_event_state(struct uevent_msg *msg, enum event_state state)
+static void export_event_state(struct udevd_uevent_msg *msg, enum event_state state)
 {
        char filename[PATH_SIZE];
        char filename_failed[PATH_SIZE];
-       char target[PATH_SIZE];
-       size_t start, end, i;
-       struct uevent_msg *loop_msg;
+       size_t start;
 
-       /* add location of queue files */
-       strlcpy(filename, udev_root, sizeof(filename));
-       strlcat(filename, "/", sizeof(filename));
-       start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
-       end = strlcat(filename, msg->devpath, sizeof(filename));
-       if (end > sizeof(filename))
-               end = sizeof(filename);
-
-       /* replace '/' to transform path into a filename */
-       for (i = start+1; i < end; i++)
-               if (filename[i] == '/')
-                       filename[i] = PATH_TO_NAME_CHAR;
-
-       /* add location of failed files */
+       /* location of queue file */
+       snprintf(filename, sizeof(filename), "%s/"EVENT_QUEUE_DIR"/%llu", udev_root, msg->seqnum);
+
+       /* location of failed file */
        strlcpy(filename_failed, udev_root, sizeof(filename_failed));
        strlcat(filename_failed, "/", sizeof(filename_failed));
-       start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
-       end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
-       if (end > sizeof(filename_failed))
-               end = sizeof(filename_failed);
-
-       /* replace '/' to transform path into a filename */
-       for (i = start+1; i < end; i++)
-               if (filename_failed[i] == '/')
-                       filename_failed[i] = PATH_TO_NAME_CHAR;
+       start = strlcat(filename_failed, EVENT_FAILED_DIR"/", sizeof(filename_failed));
+       strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+       path_encode(&filename_failed[start], sizeof(filename_failed) - start);
 
        switch (state) {
        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);
-               return;
+               selinux_setfscreatecon(filename, NULL, S_IFLNK);        
+               symlink(msg->devpath, filename);
+               selinux_resetfscreatecon();
+               break;
        case EVENT_FINISHED:
-       case EVENT_FAILED:
-               unlink(filename_failed);
-               delete_path(filename_failed);
-
-               /* don't remove, if events for the same path are still pending */
-               list_for_each_entry(loop_msg, &running_list, node)
-                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-                               return;
-
-               list_for_each_entry(loop_msg, &exec_list, node)
-                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
-                               return;
-
-               /* move failed events to the failed directory */
-               if (state == EVENT_FAILED) {
-                       create_path(filename_failed);
-                       rename(filename, filename_failed);
+               if (msg->devpath_old != NULL) {
+                       /* "move" event - rename failed file to current name, do not delete failed */
+                       char filename_failed_old[PATH_SIZE];
+
+                       strlcpy(filename_failed_old, udev_root, sizeof(filename_failed_old));
+                       strlcat(filename_failed_old, "/", sizeof(filename_failed_old));
+                       start = strlcat(filename_failed_old, EVENT_FAILED_DIR"/", sizeof(filename_failed_old));
+                       strlcat(filename_failed_old, msg->devpath_old, sizeof(filename_failed_old));
+                       path_encode(&filename_failed_old[start], sizeof(filename) - start);
+
+                       if (rename(filename_failed_old, filename_failed) == 0)
+                               info("renamed devpath, moved failed state of '%s' to %s'\n",
+                                    msg->devpath_old, msg->devpath);
                } else {
-                       unlink(filename);
+                       unlink(filename_failed);
+                       delete_path(filename_failed);
                }
 
-               /* clean up the queue directory */
+               unlink(filename);
                delete_path(filename);
+               break;
+       case EVENT_FAILED:
+               /* move failed event to the failed directory */
+               create_path(filename_failed);
+               rename(filename, filename_failed);
 
-               return;
+               /* clean up possibly empty queue directory */
+               delete_path(filename);
+               break;
        }
+
+       return;
 }
 
-static void msg_queue_delete(struct uevent_msg *msg)
+static void msg_queue_delete(struct udevd_uevent_msg *msg)
 {
        list_del(&msg->node);
 
-       /* mark as failed, if add event returns non-zero */
+       /* mark as failed, if "add" event returns non-zero */
        if (msg->exitstatus && strcmp(msg->action, "add") == 0)
                export_event_state(msg, EVENT_FAILED);
        else
@@ -239,7 +223,7 @@ static void msg_queue_delete(struct uevent_msg *msg)
        free(msg);
 }
 
-static void udev_event_run(struct uevent_msg *msg)
+static void udev_event_run(struct udevd_uevent_msg *msg)
 {
        pid_t pid;
        int retval;
@@ -258,32 +242,36 @@ static void udev_event_run(struct uevent_msg *msg)
 
                logging_init("udevd-event");
                setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
+
                retval = udev_event_process(msg);
-               info("seq %llu finished", msg->seqnum);
+               info("seq %llu finished with %i\n", msg->seqnum, retval);
 
                logging_close();
                if (retval)
                        exit(1);
                exit(0);
        case -1:
-               err("fork of child failed: %s", strerror(errno));
+               err("fork of child failed: %s\n", strerror(errno));
                msg_queue_delete(msg);
                break;
        default:
                /* get SIGCHLD in main loop */
-               info("seq %llu forked, pid [%d], '%s' '%s', %ld seconds old",
+               info("seq %llu forked, pid [%d], '%s' '%s', %ld seconds old\n",
                     msg->seqnum, pid,  msg->action, msg->subsystem, time(NULL) - msg->queue_time);
                msg->pid = pid;
        }
 }
 
-static void msg_queue_insert(struct uevent_msg *msg)
+static void msg_queue_insert(struct udevd_uevent_msg *msg)
 {
        char filename[PATH_SIZE];
        int fd;
 
        msg->queue_time = time(NULL);
 
+       export_event_state(msg, EVENT_QUEUED);
+       info("seq %llu queued, '%s' '%s'\n", msg->seqnum, msg->action, msg->subsystem);
+
        strlcpy(filename, udev_root, sizeof(filename));
        strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
        fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
@@ -296,7 +284,14 @@ static void msg_queue_insert(struct uevent_msg *msg)
                close(fd);
        }
 
-       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) {
@@ -309,34 +304,70 @@ static void msg_queue_insert(struct uevent_msg *msg)
        run_exec_q = 1;
 }
 
-/* runs event and removes event from run queue when finished */
-static int running_processes(void)
+static int mem_size_mb(void)
 {
-       int f;
-       static char buf[4096];
-       int len;
-       int running;
-       const char *pos;
+       FILE* f;
+       char buf[4096];
+       long int memsize = -1;
 
-       f = open("/proc/stat", O_RDONLY);
-       if (f == -1)
+       f = fopen("/proc/meminfo", "r");
+       if (f == NULL)
                return -1;
 
-       len = read(f, buf, sizeof(buf)-1);
-       close(f);
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               long int value;
+
+               if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+                       memsize = value / 1024;
+                       break;
+               }
+       }
+
+       fclose(f);
+       return memsize;
+}
+
+static int cpu_count(void)
+{
+       FILE* f;
+       char buf[4096];
+       int count = 0;
 
-       if (len <= 0)
+       f = fopen("/proc/stat", "r");
+       if (f == NULL)
                return -1;
-       else
-               buf[len] = '\0';
 
-       pos = strstr(buf, "procs_running ");
-       if (pos == NULL)
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
+                       count++;
+       }
+
+       fclose(f);
+       if (count == 0)
                return -1;
+       return count;
+}
+
+static int running_processes(void)
+{
+       FILE* f;
+       char buf[4096];
+       int running = -1;
 
-       if (sscanf(pos, "procs_running %u", &running) != 1)
+       f = fopen("/proc/stat", "r");
+       if (f == NULL)
                return -1;
 
+       while (fgets(buf, sizeof(buf), f) != NULL) {
+               int value;
+
+               if (sscanf(buf, "procs_running %u", &value) == 1) {
+                       running = value;
+                       break;
+               }
+       }
+
+       fclose(f);
        return running;
 }
 
@@ -429,49 +460,97 @@ static int compare_devpath(const char *running, const char *waiting)
        return 0;
 }
 
-/* returns still running task for the same device, its parent or its physical device */
-static int running_with_devpath(struct uevent_msg *msg, int limit)
+/* lookup event for identical, parent, child, or physical device */
+static int devpath_busy(struct udevd_uevent_msg *msg, int limit)
 {
-       struct uevent_msg *loop_msg;
+       struct udevd_uevent_msg *loop_msg;
        int childs_count = 0;
 
+       /* check exec-queue which may still contain delayed events we depend on */
+       list_for_each_entry(loop_msg, &exec_list, node) {
+               /* skip ourself and all later events */
+               if (loop_msg->seqnum >= msg->seqnum)
+                       break;
+
+               /* check our old name */
+               if (msg->devpath_old != NULL)
+                       if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+                               return 2;
+
+               /* check identical, parent, or child device event */
+               if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
+                       dbg("%llu, device event still pending %llu (%s)\n",
+                           msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
+                       return 3;
+               }
+
+               /* check for our major:minor number */
+               if (msg->devt && loop_msg->devt == msg->devt &&
+                   strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+                       dbg("%llu, device event still pending %llu (%d:%d)\n", msg->seqnum,
+                           loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+                       return 4;
+               }
+
+               /* check physical device event (special case of parent) */
+               if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
+                       if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
+                               dbg("%llu, physical device event still pending %llu (%s)\n",
+                                   msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
+                               return 5;
+                       }
+       }
+
+       /* check run queue for still running events */
        list_for_each_entry(loop_msg, &running_list, node) {
                if (limit && childs_count++ > limit) {
-                       dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count);
+                       dbg("%llu, maximum number (%i) of childs reached\n", msg->seqnum, childs_count);
                        return 1;
                }
 
-               /* return running parent/child device event */
+               /* check our old name */
+               if (msg->devpath_old != NULL)
+                       if (strcmp(loop_msg->devpath , msg->devpath_old) == 0)
+                               return 2;
+
+               /* check identical, parent, or child device event */
                if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
-                       dbg("%llu, child device event still running %llu (%s)",
+                       dbg("%llu, device event still running %llu (%s)\n",
                            msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-                       return 2;
+                       return 3;
+               }
+
+               /* check for our major:minor number */
+               if (msg->devt && loop_msg->devt == msg->devt &&
+                   strcmp(msg->subsystem, loop_msg->subsystem) == 0) {
+                       dbg("%llu, device event still running %llu (%d:%d)\n", msg->seqnum,
+                           loop_msg->seqnum, major(loop_msg->devt), minor(loop_msg->devt));
+                       return 4;
                }
 
-               /* return running physical device event */
+               /* check physical device event (special case of parent) */
                if (msg->physdevpath && msg->action && strcmp(msg->action, "add") == 0)
                        if (compare_devpath(loop_msg->devpath, msg->physdevpath) != 0) {
-                               dbg("%llu, physical device event still running %llu (%s)",
+                               dbg("%llu, physical device event still running %llu (%s)\n",
                                    msg->seqnum, loop_msg->seqnum, loop_msg->devpath);
-                               return 3;
+                               return 5;
                        }
        }
-
        return 0;
 }
 
-/* exec queue management routine executes the events and serializes events in the same sequence */
+/* serializes events for the identical and parent and child devices */
 static void msg_queue_manager(void)
 {
-       struct uevent_msg *loop_msg;
-       struct uevent_msg *tmp_msg;
+       struct udevd_uevent_msg *loop_msg;
+       struct udevd_uevent_msg *tmp_msg;
        int running;
 
        if (list_empty(&exec_list))
                return;
 
        running = running_processes();
-       dbg("%d processes runnning on system", running);
+       dbg("%d processes runnning on system\n", running);
        if (running < 0)
                running = max_childs_running;
 
@@ -479,16 +558,16 @@ static void msg_queue_manager(void)
                /* check running processes in our session and possibly throttle */
                if (running >= max_childs_running) {
                        running = running_processes_in_session(sid, max_childs_running+10);
-                       dbg("at least %d processes running in session", running);
+                       dbg("at least %d processes running in session\n", running);
                        if (running >= max_childs_running) {
-                               dbg("delay seq %llu, too many processes already running", loop_msg->seqnum);
+                               dbg("delay seq %llu, too many processes already running\n", loop_msg->seqnum);
                                return;
                        }
                }
 
-               /* don't run two processes for the same devpath and wait for the parent*/
-               if (running_with_devpath(loop_msg, max_childs)) {
-                       dbg("delay seq %llu (%s)", loop_msg->seqnum, loop_msg->devpath);
+               /* serialize and wait for parent or child events */
+               if (devpath_busy(loop_msg, max_childs) != 0) {
+                       dbg("delay seq %llu (%s)\n", loop_msg->seqnum, loop_msg->devpath);
                        continue;
                }
 
@@ -496,22 +575,23 @@ static void msg_queue_manager(void)
                list_move_tail(&loop_msg->node, &running_list);
                udev_event_run(loop_msg);
                running++;
-               dbg("moved seq %llu to running list", loop_msg->seqnum);
+               dbg("moved seq %llu to running list\n", loop_msg->seqnum);
        }
 }
 
-static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
+static struct udevd_uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 {
        int bufpos;
        int i;
-       struct uevent_msg *msg;
-       int major = 0;
-       int minor = 0;
+       struct udevd_uevent_msg *msg;
+       char *physdevdriver_key = NULL;
+       int maj = 0;
+       int min = 0;
 
-       msg = malloc(sizeof(struct uevent_msg) + buf_size);
+       msg = malloc(sizeof(struct udevd_uevent_msg) + buf_size);
        if (msg == NULL)
                return NULL;
-       memset(msg, 0x00, sizeof(struct uevent_msg) + buf_size);
+       memset(msg, 0x00, sizeof(struct udevd_uevent_msg) + buf_size);
 
        /* copy environment buffer and reconstruct envp */
        memcpy(msg->envbuf, buf, buf_size);
@@ -524,7 +604,7 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                keylen = strlen(key);
                msg->envp[i] = key;
                bufpos += keylen + 1;
-               dbg("add '%s' to msg.envp[%i]", msg->envp[i], i);
+               dbg("add '%s' to msg.envp[%i]\n", msg->envp[i], i);
 
                /* remember some keys for further processing */
                if (strncmp(key, "ACTION=", 7) == 0)
@@ -533,23 +613,36 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                        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, "DEVPATH_OLD=", 12) == 0)
+                       msg->devpath_old = &key[12];
                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) {
-               info("DEVPATH or ACTION missing, ignore message");
+               info("DEVPATH or ACTION missing, ignore message\n");
                free(msg);
                return NULL;
        }
@@ -557,22 +650,21 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 }
 
 /* receive the udevd message from userspace */
-static struct uevent_msg *get_udevd_msg(void)
+static void get_ctrl_msg(void)
 {
-       static struct udevd_msg usend_msg;
-       struct uevent_msg *msg;
+       struct udevd_ctrl_msg ctrl_msg;
        ssize_t size;
        struct msghdr smsg;
        struct cmsghdr *cmsg;
        struct iovec iov;
        struct ucred *cred;
        char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
-       int envbuf_size;
        int *intval;
+       char *pos;
 
-       memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
-       iov.iov_base = &usend_msg;
-       iov.iov_len = sizeof(struct udevd_msg);
+       memset(&ctrl_msg, 0x00, sizeof(struct udevd_ctrl_msg));
+       iov.iov_base = &ctrl_msg;
+       iov.iov_len = sizeof(struct udevd_ctrl_msg);
 
        memset(&smsg, 0x00, sizeof(struct msghdr));
        smsg.msg_iov = &iov;
@@ -583,72 +675,82 @@ static struct uevent_msg *get_udevd_msg(void)
        size = recvmsg(udevd_sock, &smsg, 0);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive user udevd message: %s", strerror(errno));
-               return NULL;
+                       err("unable to receive user udevd message: %s\n", strerror(errno));
+               return;
        }
        cmsg = CMSG_FIRSTHDR(&smsg);
        cred = (struct ucred *) CMSG_DATA(cmsg);
 
        if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-               err("no sender credentials received, message ignored");
-               return NULL;
+               err("no sender credentials received, message ignored\n");
+               return;
        }
 
        if (cred->uid != 0) {
-               err("sender uid=%i, message ignored", cred->uid);
-               return NULL;
+               err("sender uid=%i, message ignored\n", cred->uid);
+               return;
        }
 
-       if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-               err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
-               return NULL;
+       if (strncmp(ctrl_msg.magic, UDEVD_CTRL_MAGIC, sizeof(UDEVD_CTRL_MAGIC)) != 0 ) {
+               err("message magic '%s' doesn't match, ignore it\n", ctrl_msg.magic);
+               return;
        }
 
-       switch (usend_msg.type) {
-       case UDEVD_UEVENT_UDEVSEND:
-               info("udevd event message received");
-               envbuf_size = size - offsetof(struct udevd_msg, envbuf);
-               dbg("envbuf_size=%i", envbuf_size);
-               msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
-               if (msg == NULL)
-                       return NULL;
-               msg->type = usend_msg.type;
-               return msg;
-       case UDEVD_STOP_EXEC_QUEUE:
-               info("udevd message (STOP_EXEC_QUEUE) received");
+       switch (ctrl_msg.type) {
+       case UDEVD_CTRL_ENV:
+               pos = strchr(ctrl_msg.buf, '=');
+               if (pos == NULL) {
+                       err("wrong key format '%s'\n", ctrl_msg.buf);
+                       break;
+               }
+               pos[0] = '\0';
+               if (pos[1] == '\0') {
+                       info("udevd message (ENV) received, unset '%s'\n", ctrl_msg.buf);
+                       unsetenv(ctrl_msg.buf);
+               } else {
+                       info("udevd message (ENV) received, set '%s=%s'\n", ctrl_msg.buf, &pos[1]);
+                       setenv(ctrl_msg.buf, &pos[1], 1);
+               }
+               break;
+       case UDEVD_CTRL_STOP_EXEC_QUEUE:
+               info("udevd message (STOP_EXEC_QUEUE) received\n");
                stop_exec_q = 1;
                break;
-       case UDEVD_START_EXEC_QUEUE:
-               info("udevd message (START_EXEC_QUEUE) received");
+       case UDEVD_CTRL_START_EXEC_QUEUE:
+               info("udevd message (START_EXEC_QUEUE) received\n");
                stop_exec_q = 0;
                msg_queue_manager();
                break;
-       case UDEVD_SET_LOG_LEVEL:
-               intval = (int *) usend_msg.envbuf;
-               info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
+       case UDEVD_CTRL_SET_LOG_LEVEL:
+               intval = (int *) ctrl_msg.buf;
+               info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i\n", *intval);
                udev_log_priority = *intval;
                sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
                putenv(udev_log);
                break;
-       case UDEVD_SET_MAX_CHILDS:
-               intval = (int *) usend_msg.envbuf;
-               info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
+       case UDEVD_CTRL_SET_MAX_CHILDS:
+               intval = (int *) ctrl_msg.buf;
+               info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i\n", *intval);
                max_childs = *intval;
                break;
-       case UDEVD_RELOAD_RULES:
-               info("udevd message (RELOAD_RULES) received");
+       case UDEVD_CTRL_SET_MAX_CHILDS_RUNNING:
+               intval = (int *) ctrl_msg.buf;
+               info("udevd message (UDEVD_SET_MAX_CHILDS_RUNNING) received, max_childs=%i\n", *intval);
+               max_childs_running = *intval;
+               break;
+       case UDEVD_CTRL_RELOAD_RULES:
+               info("udevd message (RELOAD_RULES) received\n");
                reload_config = 1;
                break;
        default:
-               dbg("unknown message type");
+               err("unknown control message type\n");
        }
-       return NULL;
 }
 
 /* receive the kernel user event message and do some sanity checks */
-static struct uevent_msg *get_netlink_msg(void)
+static struct udevd_uevent_msg *get_netlink_msg(void)
 {
-       struct uevent_msg *msg;
+       struct udevd_uevent_msg *msg;
        int bufpos;
        ssize_t size;
        static char buffer[UEVENT_BUFFER_SIZE+512];
@@ -657,39 +759,38 @@ static struct uevent_msg *get_netlink_msg(void)
        size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive kernel netlink message: %s", strerror(errno));
+                       err("unable to receive kernel netlink message: %s\n", strerror(errno));
                return NULL;
        }
 
        if ((size_t)size > sizeof(buffer)-1)
                size = sizeof(buffer)-1;
        buffer[size] = '\0';
-       dbg("uevent_size=%zi", size);
+       dbg("uevent_size=%zi\n", size);
 
        /* start of event payload */
        bufpos = strlen(buffer)+1;
        msg = get_msg_from_envbuf(&buffer[bufpos], size-bufpos);
        if (msg == NULL)
                return NULL;
-       msg->type = UDEVD_UEVENT_NETLINK;
 
        /* validate message */
        pos = strchr(buffer, '@');
        if (pos == NULL) {
-               err("invalid uevent '%s'", buffer);
+               err("invalid uevent '%s'\n", buffer);
                free(msg);
                return NULL;
        }
        pos[0] = '\0';
 
        if (msg->action == NULL) {
-               info("no ACTION in payload found, skip event '%s'", buffer);
+               info("no ACTION in payload found, skip event '%s'\n", buffer);
                free(msg);
                return NULL;
        }
 
        if (strcmp(msg->action, buffer) != 0) {
-               err("ACTION in payload does not match uevent, skip event '%s'", buffer);
+               err("ACTION in payload does not match uevent, skip event '%s'\n", buffer);
                free(msg);
                return NULL;
        }
@@ -720,11 +821,11 @@ static void asmlinkage sig_handler(int signum)
 static void udev_done(int pid, int exitstatus)
 {
        /* find msg associated with pid and delete it */
-       struct uevent_msg *msg;
+       struct udevd_uevent_msg *msg;
 
        list_for_each_entry(msg, &running_list, node) {
                if (msg->pid == pid) {
-                       info("seq %llu, pid [%d] exit with %i, %ld seconds old", msg->seqnum, msg->pid,
+                       info("seq %llu, pid [%d] exit with %i, %ld seconds old\n", msg->seqnum, msg->pid,
                             exitstatus, time(NULL) - msg->queue_time);
                        msg->exitstatus = exitstatus;
                        msg_queue_delete(msg);
@@ -758,7 +859,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;
@@ -766,22 +866,21 @@ static int init_udevd_socket(void)
        memset(&saddr, 0x00, sizeof(saddr));
        saddr.sun_family = AF_LOCAL;
        /* use abstract namespace for socket path */
-       strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
-       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+       strcpy(&saddr.sun_path[1], UDEVD_CTRL_SOCK_PATH);
+       addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
 
        udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udevd_sock == -1) {
-               err("error getting socket: %s", strerror(errno));
+               err("error getting socket: %s\n", strerror(errno));
                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) {
-               err("bind failed: %s", strerror(errno));
+               err("bind failed: %s\n", strerror(errno));
+               close(udevd_sock);
+               udevd_sock = -1;
                return -1;
        }
 
@@ -800,11 +899,11 @@ static int init_uevent_netlink_sock(void)
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
        snl.nl_family = AF_NETLINK;
        snl.nl_pid = getpid();
-       snl.nl_groups = 0xffffffff;
+       snl.nl_groups = 1;
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
-               err("error getting socket: %s", strerror(errno));
+               err("error getting socket: %s\n", strerror(errno));
                return -1;
        }
 
@@ -813,7 +912,7 @@ static int init_uevent_netlink_sock(void)
 
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl, sizeof(struct sockaddr_nl));
        if (retval < 0) {
-               err("bind failed: %s", strerror(errno));
+               err("bind failed: %s\n", strerror(errno));
                close(uevent_netlink_sock);
                uevent_netlink_sock = -1;
                return -1;
@@ -841,6 +940,7 @@ static void export_initial_seqnum(void)
        }
        strlcpy(filename, udev_root, sizeof(filename));
        strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+       create_path(filename);
        fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
        if (fd >= 0) {
                write(fd, seqnum, len);
@@ -856,67 +956,121 @@ 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' },
+               { "debug", 0, NULL, 'D' },
+               { "help", 0, NULL, 'h' },
+               { "version", 0, NULL, 'V' },
+               {}
+       };
+       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();
-       dbg("version %s", UDEV_VERSION);
+       selinux_init();
+       dbg("version %s\n", UDEV_VERSION);
+
+       while (1) {
+               option = getopt_long(argc, argv, "dDthV", options, NULL);
+               if (option == -1)
+                       break;
+
+               switch (option) {
+               case 'd':
+                       daemonize = 1;
+                       break;
+               case 't':
+                       debug_trace = 1;
+                       break;
+               case 'D':
+                       debug = 1;
+                       if (udev_log_priority < LOG_INFO)
+                               udev_log_priority = LOG_INFO;
+                       break;
+               case 'h':
+                       printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] [--version]\n");
+                       goto exit;
+               case 'V':
+                       printf("%s\n", UDEV_VERSION);
+                       goto exit;
+               default:
+                       goto exit;
+               }
+       }
 
        if (getuid() != 0) {
-               err("need to be root, exit");
+               fprintf(stderr, "root privileges required\n");
+               err("root privileges required\n");
                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");
-                       daemonize = 1;
-               }
-               if (strcmp(arg, "--stop-exec-queue") == 0) {
-                       info("will not execute events until START_EXEC_QUEUE is received");
-                       stop_exec_q = 1;
-               }
+       /* make sure std{in,out,err} fd's are in a sane state */
+       fd = open("/dev/null", O_RDWR);
+       if (fd < 0) {
+               fprintf(stderr, "cannot open /dev/null\n");
+               err("cannot open /dev/null\n");
        }
+       if (fd > STDIN_FILENO)
+               dup2(fd, STDIN_FILENO);
+       if (write(STDOUT_FILENO, 0, 0) < 0)
+               dup2(fd, STDOUT_FILENO);
+       if (write(STDERR_FILENO, 0, 0) < 0)
+               dup2(fd, STDERR_FILENO);
 
        /* 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\n");
                        rc = 1;
                } else {
-                       err("error initializing udevd socket: %s", strerror(errno));
+                       fprintf(stderr, "error initializing udevd socket\n");
+                       err("error initializing udevd socket\n");
                        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\n");
                rc = 3;
                goto exit;
        }
 
-       /* parse the rules and keep it in memory */
+       /* setup signal handler pipe */
+       retval = pipe(signal_pipe);
+       if (retval < 0) {
+               err("error getting pipes: %s\n", strerror(errno));
+               goto exit;
+       }
+
+       retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on read pipe: %s\n", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
+       if (retval < 0) {
+               err("error fcntl on read pipe: %s\n", strerror(errno));
+               goto exit;
+       }
+
+       retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on write pipe: %s\n", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
+       if (retval < 0) {
+               err("error fcntl on write pipe: %s\n", strerror(errno));
+               goto exit;
+       }
+
+       /* parse the rules and keep them in memory */
        sysfs_init();
        udev_rules_init(&rules, 1);
 
@@ -928,18 +1082,26 @@ int main(int argc, char *argv[], char *envp[])
                pid = fork();
                switch (pid) {
                case 0:
-                       dbg("daemonized fork running");
+                       dbg("daemonized fork running\n");
                        break;
                case -1:
-                       err("fork of daemon failed: %s", strerror(errno));
+                       err("fork of daemon failed: %s\n", strerror(errno));
                        rc = 4;
                        goto exit;
                default:
-                       dbg("child [%u] running, parent exits", pid);
+                       dbg("child [%u] running, parent exits\n", pid);
+                       rc = 0;
                        goto exit;
                }
        }
 
+       /* redirect std{out,err} fd's */
+       if (!debug)
+               dup2(fd, STDOUT_FILENO);
+       dup2(fd, STDERR_FILENO);
+       if (fd > STDERR_FILENO)
+               close(fd);
+
        /* set scheduling priority for the daemon */
        setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
 
@@ -948,44 +1110,23 @@ int main(int argc, char *argv[], char *envp[])
 
        /* become session leader */
        sid = setsid();
-       dbg("our session is %d", sid);
+       dbg("our session is %d\n", sid);
 
        /* OOM_DISABLE == -17 */
        fd = open("/proc/self/oom_adj", O_RDWR);
        if (fd < 0)
-               err("error disabling OOM: %s", strerror(errno));
+               err("error disabling OOM: %s\n", strerror(errno));
        else {
                write(fd, "-17", 3);
                close(fd);
        }
 
-       /* setup signal handler pipe */
-       retval = pipe(signal_pipe);
-       if (retval < 0) {
-               err("error getting pipes: %s", strerror(errno));
-               goto exit;
-       }
+       fd = open("/dev/kmsg", O_WRONLY);
+       if (fd > 0) {
+               const char *str = "<6>udevd version " UDEV_VERSION " started\n";
 
-       retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
-       if (retval < 0) {
-               err("error fcntl on read pipe: %s", strerror(errno));
-               goto exit;
-       }
-       retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
-       if (retval < 0) {
-               err("error fcntl on read pipe: %s", strerror(errno));
-               goto exit;
-       }
-
-       retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
-       if (retval < 0) {
-               err("error fcntl on write pipe: %s", strerror(errno));
-               goto exit;
-       }
-       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
-       if (retval < 0) {
-               err("error fcntl on write pipe: %s", strerror(errno));
-               goto exit;
+               write(fd, str, strlen(str));
+               close(fd);
        }
 
        /* set signal handlers */
@@ -1000,28 +1141,45 @@ int main(int argc, char *argv[], char *envp[])
 
        /* watch rules directory */
        inotify_fd = inotify_init();
-       if (inotify_fd >= 0)
-               inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
-       else if (errno == ENOSYS)
-               err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+       if (inotify_fd >= 0) {
+               char filename[PATH_MAX];
+
+               inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+
+               /* watch dynamic rules directory */
+               strlcpy(filename, udev_root, sizeof(filename));
+               strlcat(filename, "/"RULES_DYN_DIR, sizeof(filename));
+               inotify_add_watch(inotify_fd, filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+       } else if (errno == ENOSYS)
+               err("the kernel does not support inotify, udevd can't monitor rules file changes\n");
        else
-               err("inotify_init failed: %s", strerror(errno));
+               err("inotify_init failed: %s\n", strerror(errno));
 
        /* maximum limit of forked childs */
        value = getenv("UDEVD_MAX_CHILDS");
        if (value)
                max_childs = strtoul(value, NULL, 10);
-       else
-               max_childs = UDEVD_MAX_CHILDS;
-       info("initialize max_childs to %u", 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\n", 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;
-       info("initialize max_childs_running to %u", 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\n", max_childs_running);
 
        /* clear environment for forked event processes */
        clearenv();
@@ -1029,6 +1187,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);
@@ -1036,7 +1196,7 @@ int main(int argc, char *argv[], char *envp[])
        maxfd = UDEV_MAX(maxfd, inotify_fd);
 
        while (!udev_exit) {
-               struct uevent_msg *msg;
+               struct udevd_uevent_msg *msg;
                int fdcount;
 
                FD_ZERO(&readfds);
@@ -1049,18 +1209,15 @@ int main(int argc, char *argv[], char *envp[])
                fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
                if (fdcount < 0) {
                        if (errno != EINTR)
-                               err("error in select: %s", strerror(errno));
+                               err("error in select: %s\n", strerror(errno));
                        continue;
                }
 
-               /* get user socket message */
-               if (FD_ISSET(udevd_sock, &readfds)) {
-                       msg = get_udevd_msg();
-                       if (msg)
-                               msg_queue_insert(msg);
-               }
+               /* get control message */
+               if (FD_ISSET(udevd_sock, &readfds))
+                       get_ctrl_msg();
 
-               /* get kernel netlink message */
+               /* get netlink message */
                if (FD_ISSET(uevent_netlink_sock, &readfds)) {
                        msg = get_netlink_msg();
                        if (msg)
@@ -1079,13 +1236,13 @@ int main(int argc, char *argv[], char *envp[])
                        int nbytes;
 
                        /* discard all possible events, we can just reload the config */
-                       if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes) {
+                       if ((ioctl(inotify_fd, FIONREAD, &nbytes) == 0) && nbytes > 0) {
                                char *buf;
 
                                reload_config = 1;
                                buf = malloc(nbytes);
-                               if (!buf) {
-                                       err("error getting buffer for inotify, disable watching");
+                               if (buf == NULL) {
+                                       err("error getting buffer for inotify, disable watching\n");
                                        close(inotify_fd);
                                        inotify_fd = -1;
                                }
@@ -1094,7 +1251,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);
@@ -1113,10 +1270,12 @@ int main(int argc, char *argv[], char *envp[])
                                msg_queue_manager();
                }
        }
+       rc = 0;
 
 exit:
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
+       selinux_exit();
 
        if (signal_pipe[READ_END] >= 0)
                close(signal_pipe[READ_END]);