logind: properly clean up user cgroups when they run empty

4 files changed, 70 insertions, 12 deletions

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 5c8d54931..58514ea0d 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -90,3 +90,3 @@ void session_free(Session *s) {
         if (s->cgroup_path)
-                hashmap_remove(s->manager->cgroups, s->cgroup_path);
+                hashmap_remove(s->manager->session_cgroups, s->cgroup_path);
 
@@ -529,3 +529,3 @@ static int session_create_cgroup(Session *s) {
 
-        hashmap_put(s->manager->cgroups, s->cgroup_path, s);
+        hashmap_put(s->manager->session_cgroups, s->cgroup_path, s);
 
@@ -648,3 +648,3 @@ static int session_terminate_cgroup(Session *s) {
 
-        hashmap_remove(s->manager->cgroups, s->cgroup_path);
+        hashmap_remove(s->manager->session_cgroups, s->cgroup_path);
 
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index b971845e1..8bd773086 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -77,2 +77,4 @@ void user_free(User *u) {
 
+        if (u->cgroup_path)
+                hashmap_remove(u->manager->user_cgroups, u->cgroup_path);
         free(u->cgroup_path);
@@ -315,2 +317,4 @@ static int user_create_cgroup(User *u) {
 
+        hashmap_put(u->manager->user_cgroups, u->cgroup_path, u);
+
         return 0;
@@ -419,2 +423,4 @@ static int user_terminate_cgroup(User *u) {
 
+        hashmap_remove(u->manager->user_cgroups, u->cgroup_path);
+
         free(u->cgroup_path);
diff --git a/src/login/logind.c b/src/login/logind.c
index 632987c8b..62f7914fe 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -66,3 +66,5 @@ Manager *manager_new(void) {
 
-        m->cgroups = hashmap_new(string_hash_func, string_compare_func);
+        m->user_cgroups = hashmap_new(string_hash_func, string_compare_func);
+        m->session_cgroups = hashmap_new(string_hash_func, string_compare_func);
+
         m->session_fds = hashmap_new(trivial_hash_func, trivial_compare_func);
@@ -72,3 +74,4 @@ Manager *manager_new(void) {
         if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons ||
-            !m->cgroups || !m->session_fds || !m->inhibitor_fds || !m->button_fds) {
+            !m->user_cgroups || !m->session_cgroups ||
+            !m->session_fds || !m->inhibitor_fds || !m->button_fds) {
                 manager_free(m);
@@ -133,3 +136,5 @@ void manager_free(Manager *m) {
 
-        hashmap_free(m->cgroups);
+        hashmap_free(m->user_cgroups);
+        hashmap_free(m->session_cgroups);
+
         hashmap_free(m->session_fds);
@@ -1010,3 +1015,3 @@ int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **sess
 
-        s = hashmap_get(m->cgroups, cgroup);
+        s = hashmap_get(m->session_cgroups, cgroup);
         if (s) {
@@ -1034,3 +1039,3 @@ int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **sess
 
-                s = hashmap_get(m->cgroups, p);
+                s = hashmap_get(m->session_cgroups, p);
                 if (s) {
@@ -1043,2 +1048,43 @@ int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **sess
 
+int manager_get_user_by_cgroup(Manager *m, const char *cgroup, User **user) {
+        User *u;
+        char *p;
+
+        assert(m);
+        assert(cgroup);
+        assert(user);
+
+        u = hashmap_get(m->user_cgroups, cgroup);
+        if (u) {
+                *user = u;
+                return 1;
+        }
+
+        p = strdup(cgroup);
+        if (!p) {
+                log_error("Out of memory.");
+                return -ENOMEM;
+        }
+
+        for (;;) {
+                char *e;
+
+                e = strrchr(p, '/');
+                if (!e || e == p) {
+                        free(p);
+                        *user = NULL;
+                        return 0;
+                }
+
+                *e = 0;
+
+                u = hashmap_get(m->user_cgroups, p);
+                if (u) {
+                        free(p);
+                        *user = u;
+                        return 1;
+                }
+        }
+}
+
 int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
@@ -1063,2 +1109,3 @@ void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
         Session *s;
+        User *u;
         int r;
@@ -1066,6 +1113,8 @@ void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
         r = manager_get_session_by_cgroup(m, cgroup, &s);
-        if (r <= 0)
-                return;
+        if (r > 0)
+                session_add_to_gc_queue(s);
 
-        session_add_to_gc_queue(s);
+        r = manager_get_user_by_cgroup(m, cgroup, &u);
+        if (r > 0)
+                user_add_to_gc_queue(u);
 }
diff --git a/src/login/logind.h b/src/login/logind.h
index 6fcef6f31..5e828bf01 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -83,3 +83,5 @@ struct Manager {
 
-        Hashmap *cgroups;
+        Hashmap *session_cgroups;
+        Hashmap *user_cgroups;
+
         Hashmap *session_fds;
@@ -148,2 +150,3 @@ int manager_get_idle_hint(Manager *m, dual_timestamp *t);
 
+int manager_get_user_by_cgroup(Manager *m, const char *cgroup, User **user);
 int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session);