chiark / gitweb /
udevd: move logging from err to info for non-hotplug uevent
[elogind.git] / udevd.c
diff --git a/udevd.c b/udevd.c
index 209b9fcd870074ed0db22e8c1a932e98b959f0a2..a926715908bbcbab7d0b6f7cd7c0a85d26a99913 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -1,5 +1,5 @@
 /*
- * udevd.c - hotplug event serializer
+ * udevd.c - event listener and serializer
  *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2004 Chris Friesen <chris_friesen@sympatico.ca>
@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <fcntl.h>
+#include <syslog.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <sys/time.h>
@@ -38,6 +39,7 @@
 #include <sys/un.h>
 #include <sys/sysinfo.h>
 #include <sys/stat.h>
+#include <linux/types.h>
 #include <linux/netlink.h>
 
 #include "list.h"
@@ -53,28 +55,23 @@ static int udevd_sock;
 static int uevent_netlink_sock;
 static pid_t sid;
 
-static int pipefds[2];
+static int signal_pipe[2] = {-1, -1};
 static volatile int sigchilds_waiting;
 static volatile int run_msg_q;
-static volatile int sig_flag;
+static volatile int udev_exit;
 static int init_phase = 1;
 static int run_exec_q;
 static int stop_exec_q;
-
-static LIST_HEAD(msg_list);
-static LIST_HEAD(exec_list);
-static LIST_HEAD(running_list);
-
-static void exec_queue_manager(void);
-static void msg_queue_manager(void);
-static void user_sighandler(void);
-static void reap_sigchilds(void);
-
 static char *udev_bin;
-static unsigned long long expected_seqnum;
 static int event_timeout;
 static int max_childs;
 static int max_childs_running;
+static unsigned long long expected_seqnum;
+static char log[32];
+
+static LIST_HEAD(msg_list);
+static LIST_HEAD(exec_list);
+static LIST_HEAD(running_list);
 
 
 #ifdef USE_LOG
@@ -101,7 +98,7 @@ static void msg_dump_queue(void)
 #endif
 }
 
-static void run_queue_delete(struct uevent_msg *msg)
+static void msg_queue_delete(struct uevent_msg *msg)
 {
        list_del(&msg->node);
        free(msg);
@@ -115,7 +112,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
 
        if (msg->seqnum == 0) {
                dbg("no SEQNUM, move straight to the exec queue");
-               list_add(&msg->node, &exec_list);
+               list_add_tail(&msg->node, &exec_list);
                run_exec_q = 1;
                return;
        }
@@ -134,14 +131,6 @@ static void msg_queue_insert(struct uevent_msg *msg)
                        init_phase = 0;
        }
 
-       /* don't delay messages with timeout set */
-       if (msg->timeout) {
-               dbg("move seq %llu with timeout %u to exec queue", msg->seqnum, msg->timeout);
-               list_add(&msg->node, &exec_list);
-               run_exec_q = 1;
-               return;
-       }
-
        /* sort message by sequence number into list */
        list_for_each_entry_reverse(loop_msg, &msg_list, node) {
                if (loop_msg->seqnum < msg->seqnum)
@@ -154,7 +143,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
                }
        }
        list_add(&msg->node, &loop_msg->node);
-       info("seq %llu queued, devpath '%s'", msg->seqnum, msg->devpath);
+       info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->devpath);
 
        /* run msg queue manager */
        run_msg_q = 1;
@@ -163,7 +152,7 @@ static void msg_queue_insert(struct uevent_msg *msg)
 }
 
 /* forks event and removes event from run queue when finished */
-static void execute_udev(struct uevent_msg *msg)
+static void udev_event_run(struct uevent_msg *msg)
 {
        char *const argv[] = { "udev", msg->subsystem, NULL };
        pid_t pid;
@@ -177,21 +166,19 @@ static void execute_udev(struct uevent_msg *msg)
                        close(uevent_netlink_sock);
                close(udevd_sock);
                logging_close();
-
                setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
                execve(udev_bin, argv, msg->envp);
                err("exec of child failed");
                _exit(1);
-               break;
        case -1:
                err("fork of child failed");
-               run_queue_delete(msg);
+               msg_queue_delete(msg);
                break;
        default:
                /* get SIGCHLD in main loop */
                sysinfo(&info);
-               info("seq %llu forked, pid %d, %ld seconds old",
-                    msg->seqnum, pid, info.uptime - msg->queue_time);
+               info("seq %llu forked, pid [%d], '%s' '%s', %ld seconds old",
+                    msg->seqnum, pid,  msg->action, msg->subsystem, info.uptime - msg->queue_time);
                msg->pid = pid;
        }
 }
@@ -208,7 +195,7 @@ static int running_processes(void)
        if (f == -1)
                return -1;
 
-       len = read(f, buf, sizeof(buf));
+       len = read(f, buf, sizeof(buf)-1);
        close(f);
 
        if (len <= 0)
@@ -257,7 +244,7 @@ static int running_processes_in_session(pid_t session, int limit)
                if (f == -1)
                        continue;
 
-               len = read(f, line, sizeof(line));
+               len = read(f, line, sizeof(line)-1);
                close(f);
 
                if (len <= 0)
@@ -385,7 +372,7 @@ static void exec_queue_manager(void)
                if (running_with_devpath(loop_msg, max_childs) == 0) {
                        /* move event to run list */
                        list_move_tail(&loop_msg->node, &running_list);
-                       execute_udev(loop_msg);
+                       udev_event_run(loop_msg);
                        running++;
                        dbg("moved seq %llu to running list", loop_msg->seqnum);
                } else
@@ -423,8 +410,9 @@ recheck:
 
                /* limit timeout during initialization phase */
                if (init_phase) {
-                       timeout = UDEVD_INIT_EVENT_TIMEOUT;
-                       dbg("initialization phase, limit timeout to %i seconds", UDEVD_INIT_EVENT_TIMEOUT);
+                       if (timeout > UDEVD_INIT_EVENT_TIMEOUT)
+                               timeout = UDEVD_INIT_EVENT_TIMEOUT;
+                       dbg("initialization phase, timeout %i seconds", timeout);
                }
 
                /* move event with expired timeout to the exec list */
@@ -441,9 +429,9 @@ recheck:
        msg_dump_queue();
 
        /* set timeout for remaining queued events */
-       if (list_empty(&msg_list) == 0) {
+       if (!list_empty(&msg_list)) {
                struct itimerval itv = {{0, 0}, {timeout - msg_age, 0}};
-               dbg("next event expires in %li seconds", timeout - msg_age);
+               info("next event expires in %li seconds", timeout - msg_age);
                setitimer(ITIMER_REAL, &itv, NULL);
        }
 }
@@ -453,6 +441,8 @@ static struct 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;
 
        msg = malloc(sizeof(struct uevent_msg) + buf_size);
        if (msg == NULL)
@@ -475,22 +465,22 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                /* remember some keys for further processing */
                if (strncmp(key, "ACTION=", 7) == 0)
                        msg->action = &key[7];
-
-               if (strncmp(key, "DEVPATH=", 8) == 0)
+               else if (strncmp(key, "DEVPATH=", 8) == 0)
                        msg->devpath = &key[8];
-
-               if (strncmp(key, "SUBSYSTEM=", 10) == 0)
+               else if (strncmp(key, "SUBSYSTEM=", 10) == 0)
                        msg->subsystem = &key[10];
-
-               if (strncmp(key, "SEQNUM=", 7) == 0)
+               else if (strncmp(key, "SEQNUM=", 7) == 0)
                        msg->seqnum = strtoull(&key[7], NULL, 10);
-
-               if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
+               else if (strncmp(key, "PHYSDEVPATH=", 12) == 0)
                        msg->physdevpath = &key[12];
-
-               if (strncmp(key, "TIMEOUT=", 8) == 0)
+               else if (strncmp(key, "MAJOR=", 6) == 0)
+                       major = strtoull(&key[6], NULL, 10);
+               else if (strncmp(key, "MINOR=", 6) == 0)
+                       minor = 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->envp[i++] = "UDEVD_EVENT=1";
        msg->envp[i] = NULL;
 
@@ -524,24 +514,24 @@ static struct uevent_msg *get_udevd_msg(void)
        size = recvmsg(udevd_sock, &smsg, 0);
        if (size <  0) {
                if (errno != EINTR)
-                       dbg("unable to receive udevd message");
+                       err("unable to receive udevd message");
                return NULL;
        }
        cmsg = CMSG_FIRSTHDR(&smsg);
        cred = (struct ucred *) CMSG_DATA(cmsg);
 
        if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
-               info("no sender credentials received, message ignored");
+               err("no sender credentials received, message ignored");
                return NULL;
        }
 
        if (cred->uid != 0) {
-               info("sender uid=%i, message ignored", cred->uid);
+               err("sender uid=%i, message ignored", cred->uid);
                return NULL;
        }
 
        if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-               info("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+               err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
                return NULL;
        }
 
@@ -569,6 +559,8 @@ static struct uevent_msg *get_udevd_msg(void)
                intval = (int *) usend_msg.envbuf;
                info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
                udev_log_priority = *intval;
+               sprintf(log, "UDEV_LOG=%i", udev_log_priority);
+               putenv(log);
                break;
        case UDEVD_SET_MAX_CHILDS:
                intval = (int *) usend_msg.envbuf;
@@ -593,14 +585,14 @@ static struct uevent_msg *get_netlink_msg(void)
        size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
        if (size <  0) {
                if (errno != EINTR)
-                       dbg("unable to receive udevd message");
+                       err("unable to receive udevd message");
                return NULL;
        }
 
        if ((size_t)size > sizeof(buffer)-1)
                size = sizeof(buffer)-1;
        buffer[size] = '\0';
-       dbg("uevent_size=%i", size);
+       dbg("uevent_size=%zi", size);
 
        /* start of event payload */
        bufpos = strlen(buffer)+1;
@@ -612,20 +604,20 @@ static struct uevent_msg *get_netlink_msg(void)
        /* validate message */
        pos = strchr(buffer, '@');
        if (pos == NULL) {
-               dbg("invalid uevent '%s'", buffer);
+               err("invalid uevent '%s'", buffer);
                free(msg);
                return NULL;
        }
        pos[0] = '\0';
 
        if (msg->action == NULL) {
-               dbg("no ACTION in payload found, skip event '%s'", buffer);
+               info("no ACTION in payload found, skip event '%s'", buffer);
                free(msg);
                return NULL;
        }
 
        if (strcmp(msg->action, buffer) != 0) {
-               dbg("ACTION in payload does not match uevent, skip event '%s'", buffer);
+               err("ACTION in payload does not match uevent, skip event '%s'", buffer);
                free(msg);
                return NULL;
        }
@@ -635,34 +627,23 @@ static struct uevent_msg *get_netlink_msg(void)
 
 static void asmlinkage sig_handler(int signum)
 {
-       int rc;
-
        switch (signum) {
                case SIGINT:
                case SIGTERM:
-                       exit(20 + signum);
+                       udev_exit = 1;
                        break;
                case SIGALRM:
                        /* set flag, then write to pipe if needed */
                        run_msg_q = 1;
-                       goto do_write;
                        break;
                case SIGCHLD:
                        /* set flag, then write to pipe if needed */
                        sigchilds_waiting = 1;
-                       goto do_write;
                        break;
        }
 
-do_write:
-       /* if pipe is empty, write to pipe to force select to return
-        * immediately when it gets called
-        */
-       if (!sig_flag) {
-               rc = write(pipefds[1],&signum,sizeof(signum));
-               if (rc >= 0)
-                       sig_flag = 1;
-       }
+       /* write to pipe, which will wakeup select() in our mainloop */
+       write(signal_pipe[WRITE_END], "", 1);
 }
 
 static void udev_done(int pid)
@@ -674,8 +655,11 @@ static void udev_done(int pid)
        list_for_each_entry(msg, &running_list, node) {
                if (msg->pid == pid) {
                        sysinfo(&info);
-                       info("seq %llu exit, %ld seconds old", msg->seqnum, info.uptime - msg->queue_time);
-                       run_queue_delete(msg);
+                       if (msg->queue_time)
+                               info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, info.uptime - msg->queue_time);
+                       else
+                               info("seq 0, pid [%d] exit", msg->pid);
+                       msg_queue_delete(msg);
 
                        /* we want to run the exec queue manager since there may
                         * be events waiting with the devpath of the one that
@@ -689,33 +673,20 @@ static void udev_done(int pid)
 
 static void reap_sigchilds(void)
 {
-       while(1) {
-               int pid = waitpid(-1, NULL, WNOHANG);
-               if ((pid == -1) || (pid == 0))
-                       break;
-               udev_done(pid);
-       }
-}
-
-/* just read everything from the pipe and clear the flag,
- * the flags was set in the signal handler
- */
-static void user_sighandler(void)
-{
-       int sig;
+       pid_t pid;
 
-       while(1) {
-               int rc = read(pipefds[0], &sig, sizeof(sig));
-               if (rc < 0)
+       while (1) {
+               pid = waitpid(-1, NULL, WNOHANG);
+               if (pid <= 0)
                        break;
-
-               sig_flag = 0;
+               udev_done(pid);
        }
 }
 
 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;
@@ -732,6 +703,9 @@ 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) {
@@ -749,6 +723,7 @@ static int init_udevd_socket(void)
 static int init_uevent_netlink_sock(void)
 {
        struct sockaddr_nl snl;
+       const int buffersize = 16 * 1024 * 1024;
        int retval;
 
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
@@ -758,14 +733,17 @@ static int init_uevent_netlink_sock(void)
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
-               dbg("error getting socket, %s", strerror(errno));
+               err("error getting socket, %s", strerror(errno));
                return -1;
        }
 
+       /* set receive buffersize */
+       setsockopt(uevent_netlink_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize));
+
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
                      sizeof(struct sockaddr_nl));
        if (retval < 0) {
-               dbg("bind failed, %s", strerror(errno));
+               err("bind failed, %s", strerror(errno));
                close(uevent_netlink_sock);
                uevent_netlink_sock = -1;
                return -1;
@@ -776,9 +754,8 @@ static int init_uevent_netlink_sock(void)
 
 int main(int argc, char *argv[], char *envp[])
 {
-       int maxsockplus;
        int retval;
-       int fd;
+       int devnull;
        struct sigaction act;
        fd_set readfds;
        const char *value;
@@ -786,7 +763,23 @@ int main(int argc, char *argv[], char *envp[])
        int daemonize = 0;
        int i;
 
+       /* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */
+       devnull = open("/dev/null", O_RDWR);
+       if (devnull >= 0)  {
+               if (devnull != STDIN_FILENO)
+                       dup2(devnull, STDIN_FILENO);
+               if (devnull != STDOUT_FILENO)
+                       dup2(devnull, STDOUT_FILENO);
+               if (devnull != STDERR_FILENO)
+                       dup2(devnull, STDERR_FILENO);
+               if (devnull > STDERR_FILENO)
+                       close(devnull);
+       }
+
        logging_init("udevd");
+       if (devnull < 0)
+               err("fatal, could not open /dev/null");
+
        udev_init_config();
        dbg("version %s", UDEV_VERSION);
 
@@ -806,6 +799,7 @@ int main(int argc, char *argv[], char *envp[])
                        stop_exec_q = 1;
                }
        }
+
        if (daemonize) {
                pid_t pid;
 
@@ -830,42 +824,29 @@ int main(int argc, char *argv[], char *envp[])
        chdir("/");
        umask(umask(077) | 022);
 
-       /*set a reasonable scheduling priority for the daemon */
+       /* set a reasonable scheduling priority for the daemon */
        setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
 
-       /* Set fds to dev/null */
-       fd = open( "/dev/null", O_RDWR );
-       if (fd >= 0)  {
-               dup2(fd, 0);
-               dup2(fd, 1);
-               dup2(fd, 2);
-               if (fd > 2)
-                       close(fd);
-       } else
-               err("error opening /dev/null %s", strerror(errno));
-
        /* setup signal handler pipe */
-       retval = pipe(pipefds);
+       retval = pipe(signal_pipe);
        if (retval < 0) {
                err("error getting pipes: %s", strerror(errno));
                goto exit;
        }
-
-       retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
+       retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                err("error fcntl on read pipe: %s", strerror(errno));
                goto exit;
        }
-       retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
+       retval = fcntl(signal_pipe[READ_END], F_SETFD, FD_CLOEXEC);
        if (retval < 0)
                err("error fcntl on read pipe: %s", strerror(errno));
-
-       retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
+       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
        if (retval < 0) {
                err("error fcntl on write pipe: %s", strerror(errno));
                goto exit;
        }
-       retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
+       retval = fcntl(signal_pipe[WRITE_END], F_SETFD, FD_CLOEXEC);
        if (retval < 0)
                err("error fcntl on write pipe: %s", strerror(errno));
 
@@ -878,20 +859,20 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
        sigaction(SIGALRM, &act, NULL);
        sigaction(SIGCHLD, &act, NULL);
-
-       if (init_uevent_netlink_sock() < 0) {
-               dbg("uevent socket not available");
-       }
+       sigaction(SIGHUP, &act, NULL);
 
        if (init_udevd_socket() < 0) {
                if (errno == EADDRINUSE)
                        dbg("another udevd running, exit");
                else
-                       dbg("error initialising udevd socket: %s", strerror(errno));
+                       dbg("error initializing udevd socket: %s", strerror(errno));
 
                goto exit;
        }
 
+       if (init_uevent_netlink_sock() < 0)
+               info("uevent socket not available");
+
        /* override of forked udev binary, used for testing */
        udev_bin = getenv("UDEV_BIN");
        if (udev_bin != NULL)
@@ -930,38 +911,42 @@ int main(int argc, char *argv[], char *envp[])
                max_childs_running = UDEVD_MAX_CHILDS_RUNNING;
        info("initialize max_childs_running to %u", max_childs_running);
 
-       FD_ZERO(&readfds);
-       FD_SET(udevd_sock, &readfds);
-       if (uevent_netlink_sock != -1)
-               FD_SET(uevent_netlink_sock, &readfds);
-       FD_SET(pipefds[0], &readfds);
-       maxsockplus = udevd_sock+1;
-       while (1) {
+       /* export log_priority , as called programs may want to follow that setting */
+       sprintf(log, "UDEV_LOG=%i", udev_log_priority);
+       putenv(log);
+
+       while (!udev_exit) {
                struct uevent_msg *msg;
+               int fdcount;
 
-               fd_set workreadfds = readfds;
-               retval = select(maxsockplus, &workreadfds, NULL, NULL, NULL);
+               FD_ZERO(&readfds);
+               FD_SET(signal_pipe[READ_END], &readfds);
+               FD_SET(udevd_sock, &readfds);
+               if (uevent_netlink_sock > 0)
+                       FD_SET(uevent_netlink_sock, &readfds);
 
-               if (retval < 0) {
+               fdcount = select(UDEV_MAX(udevd_sock, uevent_netlink_sock)+1, &readfds, NULL, NULL, NULL);
+               if (fdcount < 0) {
                        if (errno != EINTR)
                                dbg("error in select: %s", strerror(errno));
                        continue;
                }
 
-               if (FD_ISSET(udevd_sock, &workreadfds)) {
+               /* get user socket message */
+               if (FD_ISSET(udevd_sock, &readfds)) {
                        msg = get_udevd_msg();
                        if (msg) {
                                /* discard kernel messages if netlink is active */
                                if (uevent_netlink_active && msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
-                                       dbg("skip uevent_helper message, netlink is active");
+                                       info("skip uevent_helper message with SEQNUM, netlink is active");
                                        free(msg);
-                                       continue;
-                               }
-                               msg_queue_insert(msg);
+                               } else
+                                       msg_queue_insert(msg);
                        }
                }
 
-               if (FD_ISSET(uevent_netlink_sock, &workreadfds)) {
+               /* get kernel netlink message */
+               if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
                        msg = get_netlink_msg();
                        if (msg) {
                                msg_queue_insert(msg);
@@ -973,9 +958,14 @@ int main(int argc, char *argv[], char *envp[])
                        }
                }
 
-               if (FD_ISSET(pipefds[0], &workreadfds))
-                       user_sighandler();
+               /* received a signal, clear our notification pipe */
+               if (FD_ISSET(signal_pipe[READ_END], &readfds)) {
+                       char buf[256];
 
+                       read(signal_pipe[READ_END], &buf, sizeof(buf));
+               }
+
+               /* forked child have returned */
                if (sigchilds_waiting) {
                        sigchilds_waiting = 0;
                        reap_sigchilds();
@@ -1000,6 +990,17 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 exit:
+       if (signal_pipe[READ_END] > 0)
+               close(signal_pipe[READ_END]);
+       if (signal_pipe[WRITE_END] > 0)
+               close(signal_pipe[WRITE_END]);
+
+       if (udevd_sock > 0)
+               close(udevd_sock);
+       if (uevent_netlink_sock > 0)
+               close(uevent_netlink_sock);
+
        logging_close();
-       return 1;
+
+       return 0;
 }