X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogind-session.c;h=b0a09e3d37ea0e3537da7902c128de129ff3c237;hp=76718500032502f79265130a007d15c180109cd1;hb=a3c159a23c7cae889f89ed69bbe82c272bf163ca;hpb=932e3ee76ea0a9d28902f694ad1873e37532da35 diff --git a/src/logind-session.c b/src/logind-session.c index 767185000..b0a09e3d3 100644 --- a/src/logind-session.c +++ b/src/logind-session.c @@ -297,7 +297,19 @@ int session_load(Session *s) { s->type = t; } - session_open_fifo(s); + if (s->fifo_path) { + int fd; + + /* If we open an unopened pipe for reading we will not + get an EOF. to trigger an EOF we hence open it for + reading, but close it right-away which then will + trigger the EOF. */ + + fd = session_create_fifo(s); + if (fd >= 0) + close_nointr_nofail(fd); + } + finish: free(remote); @@ -368,13 +380,15 @@ static int session_link_x11_socket(Session *s) { return -ENOENT; } - t = strappend(s->user->runtime_path, "/display"); + t = strappend(s->user->runtime_path, "/X11/display"); if (!t) { log_error("Out of memory"); free(f); return -ENOMEM; } + mkdir_parents(t, 0755); + if (link(f, t) < 0) { if (errno == EEXIST) { unlink(t); @@ -473,6 +487,7 @@ static int session_create_cgroup(Session *s) { STRV_FOREACH(k, s->manager->controllers) { if (strv_contains(s->reset_controllers, *k) || + strv_contains(s->manager->reset_controllers, *k) || strv_contains(s->controllers, *k)) continue; @@ -489,6 +504,18 @@ static int session_create_cgroup(Session *s) { log_warning("Failed to reset controller %s: %s", *k, strerror(-r)); } + + STRV_FOREACH(k, s->manager->reset_controllers) { + + if (strv_contains(s->reset_controllers, *k) || + strv_contains(s->controllers, *k)) + continue; + + r = cg_attach(*k, "/", s->leader); + if (r < 0) + log_warning("Failed to reset controller %s: %s", *k, strerror(-r)); + + } } hashmap_put(s->manager->cgroups, s->cgroup_path, s); @@ -509,7 +536,8 @@ int session_start(Session *s) { if (r < 0) return r; - log_info("New session %s of user %s.", s->id, s->user->name); + log_full(s->display || s->tty ? LOG_INFO : LOG_DEBUG, + "New session %s of user %s.", s->id, s->user->name); /* Create cgroup */ r = session_create_cgroup(s); @@ -561,7 +589,7 @@ static bool session_shall_kill(Session *s) { return strv_contains(s->manager->kill_only_users, s->user->name); } -static int session_kill_cgroup(Session *s) { +static int session_terminate_cgroup(Session *s) { int r; char **k; @@ -613,7 +641,7 @@ static int session_unlink_x11_socket(Session *s) { s->user->display = NULL; - t = strappend(s->user->runtime_path, "/display"); + t = strappend(s->user->runtime_path, "/X11/display"); if (!t) { log_error("Out of memory"); return -ENOMEM; @@ -631,10 +659,11 @@ int session_stop(Session *s) { assert(s); if (s->started) - log_info("Removed session %s.", s->id); + log_full(s->display || s->tty ? LOG_INFO : LOG_DEBUG, + "Removed session %s.", s->id); /* Kill cgroup */ - k = session_kill_cgroup(s); + k = session_terminate_cgroup(s); if (k < 0) r = k; @@ -755,42 +784,17 @@ void session_set_idle_hint(Session *s, bool b) { "IdleSinceHintMonotonic\0"); } -int session_open_fifo(Session *s) { - struct epoll_event ev; - int r; - - assert(s); - - if (s->fifo_fd >= 0) - return 0; - - if (!s->fifo_path) - return -EINVAL; - - s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NDELAY); - if (s->fifo_fd < 0) - return -errno; - - r = hashmap_put(s->manager->fifo_fds, INT_TO_PTR(s->fifo_fd + 1), s); - if (r < 0) - return r; - - zero(ev); - ev.events = 0; - ev.data.u32 = FD_FIFO_BASE + s->fifo_fd; - - if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->fifo_fd, &ev) < 0) - return -errno; - - return 0; -} - int session_create_fifo(Session *s) { int r; assert(s); + /* Create FIFO */ if (!s->fifo_path) { + r = safe_mkdir("/run/systemd/sessions", 0755, 0, 0); + if (r < 0) + return r; + if (asprintf(&s->fifo_path, "/run/systemd/sessions/%s.ref", s->id) < 0) return -ENOMEM; @@ -799,9 +803,24 @@ int session_create_fifo(Session *s) { } /* Open reading side */ - r = session_open_fifo(s); - if (r < 0) - return r; + if (s->fifo_fd < 0) { + struct epoll_event ev; + + s->fifo_fd = open(s->fifo_path, O_RDONLY|O_CLOEXEC|O_NDELAY); + if (s->fifo_fd < 0) + return -errno; + + r = hashmap_put(s->manager->fifo_fds, INT_TO_PTR(s->fifo_fd + 1), s); + if (r < 0) + return r; + + zero(ev); + ev.events = 0; + ev.data.u32 = FD_FIFO_BASE + s->fifo_fd; + + if (epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_ADD, s->fifo_fd, &ev) < 0) + return -errno; + } /* Open writing side */ r = open(s->fifo_path, O_WRONLY|O_CLOEXEC|O_NDELAY); @@ -828,12 +847,12 @@ void session_remove_fifo(Session *s) { } } -int session_check_gc(Session *s) { +int session_check_gc(Session *s, bool drop_not_started) { int r; assert(s); - if (!s->started) + if (drop_not_started && !s->started) return 0; if (s->fifo_fd >= 0) { @@ -869,6 +888,47 @@ void session_add_to_gc_queue(Session *s) { s->in_gc_queue = true; } +int session_kill(Session *s, KillWho who, int signo) { + int r = 0; + Set *pid_set = NULL; + + assert(s); + + if (!s->cgroup_path) + return -ESRCH; + + if (s->leader <= 0 && who == KILL_LEADER) + return -ESRCH; + + if (s->leader > 0) + if (kill(s->leader, signo) < 0) + r = -errno; + + if (who == KILL_ALL) { + int q; + + pid_set = set_new(trivial_hash_func, trivial_compare_func); + if (!pid_set) + return -ENOMEM; + + if (s->leader > 0) { + q = set_put(pid_set, LONG_TO_PTR(s->leader)); + if (q < 0) + r = q; + } + + q = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, s->cgroup_path, signo, false, true, false, pid_set); + if (q < 0) + if (q != -EAGAIN && q != -ESRCH && q != -ENOENT) + r = q; + } + + if (pid_set) + set_free(pid_set); + + return r; +} + static const char* const session_type_table[_SESSION_TYPE_MAX] = { [SESSION_TTY] = "tty", [SESSION_X11] = "x11", @@ -876,3 +936,10 @@ static const char* const session_type_table[_SESSION_TYPE_MAX] = { }; DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType); + +static const char* const kill_who_table[_KILL_WHO_MAX] = { + [KILL_LEADER] = "leader", + [KILL_ALL] = "all" +}; + +DEFINE_STRING_TABLE_LOOKUP(kill_who, KillWho);