Classify processes from sessions into cgroups

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 9d731b9a377bad3e1e05bed8707bfc128eefb651..350a597d10351caf95e46dc8a0701e8e6d43eaed 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -36,6 +36,8 @@
 #include "audit.h"
 #include "bus-util.h"
 #include "bus-error.h"
+#include "cgroup-util.h"
+#include "def.h"
 #include "logind-session.h"
 #include "formats-util.h"
 #include "terminal-util.h"
@@ -477,6 +479,25 @@ int session_activate(Session *s) {
         return 0;
 }
 
+static int session_start_cgroup(Session *s) {
+        int r;
+
+        assert(s);
+        assert(s->user);
+        assert(s->leader > 0);
+
+        /* First, create our own group */
+        r = cg_create(SYSTEMD_CGROUP_CONTROLLER, s->id);
+        if (r < 0)
+                return log_error_errno(r, "Failed to create cgroup %s: %m", s->id);
+
+        r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, s->id, s->leader);
+        if (r < 0)
+                log_warning_errno(r, "Failed to attach PID %d to cgroup %s: %m", s->leader, s->id);
+
+        return 0;
+}
+
 int session_start(Session *s) {
         int r;
 
@@ -492,6 +513,10 @@ int session_start(Session *s) {
         if (r < 0)
                 return r;
 
+        r = session_start_cgroup(s);
+        if (r < 0)
+                return r;
+
         log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
                    LOG_MESSAGE_ID(SD_MESSAGE_SESSION_START),
                    "SESSION_ID=%s", s->id,
@@ -529,8 +554,23 @@ int session_start(Session *s) {
         return 0;
 }
 
+static int session_stop_cgroup(Session *s, bool force) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        int r;
+
+        assert(s);
+
+        if (force || manager_shall_kill(s->manager, s->user->name)) {
+                r = session_kill(s, KILL_ALL, SIGTERM);
+                if (r < 0)
+                        return r;
+        }
+
+        return 0;
+}
+
 int session_stop(Session *s, bool force) {
-        int r = 0;
+        int r;
 
         assert(s);
 
@@ -545,6 +585,9 @@ int session_stop(Session *s, bool force) {
         /* We are going down, don't care about FIFOs anymore */
         session_remove_fifo(s);
 
+        /* Kill cgroup */
+        r = session_stop_cgroup(s, force);
+
         s->stopping = true;
 
         user_elect_display(s->user);
@@ -617,7 +660,7 @@ int session_release(Session *s) {
         /* In systemd, session release is triggered by user jobs
            dying.  In elogind we don't have that so go ahead and stop
            now.  */
-        session_stop(s, false);
+        return session_stop(s, false);
 }
 
 bool session_is_active(Session *s) {
@@ -822,6 +865,9 @@ bool session_check_gc(Session *s, bool drop_not_started) {
                         return true;
         }
 
+        if (cg_is_empty_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, false) > 0)
+                return true;
+
         return false;
 }
 
@@ -854,8 +900,23 @@ SessionState session_get_state(Session *s) {
 int session_kill(Session *s, KillWho who, int signo) {
         assert(s);
 
-        /* No way to kill the session without cgroups.  */
-        return -ESRCH;
+        if (who == KILL_LEADER) {
+                if (s->leader <= 0)
+                        return -ESRCH;
+
+                /* FIXME: verify that leader is in cgroup?  */
+
+                if (kill(s->leader, signo) < 0) {
+                        return log_error_errno(errno, "Failed to kill process leader %d for session %s: %m", s->leader, s->id);
+                }
+                return 0;
+        } else {
+                bool sigcont = false;
+                bool ignore_self = true;
+                bool rem = true;
+                return cg_kill_recursive (SYSTEMD_CGROUP_CONTROLLER, s->id, signo,
+                                          sigcont, ignore_self, rem, NULL);
+        }
 }
 
 static int session_open_vt(Session *s) {