File 0022-core-when-coming-back-from-reload-reexec-r... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0022-core-when-coming-back-from-reload-reexec-reapply-all.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Currently displaying revision a47769d8fb254159c07462a5675e1695 , Show latest

From feb5a6de52635fb7c84252f6c1e8c36088e559cb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Sep 2017 14:32:33 +0200
Subject: [PATCH 22/51] core: when coming back from reload/reexec, reapply all
 cgroup properties

With this change we'll invalidate all cgroup settings after coming back
from a daemon reload/reexec, so that the new settings are instantly
applied.

This is useful for the BPF case, because we don't serialize/deserialize
the BPF program fd, and hence have to install a new, updated BPF program
when coming back from the reload/reexec. However, this is also useful
for the rest of the cgroup settings, as it ensures that user
configuration really takes effect wherever we can.

(cherry picked from commit 58d83430e1276fe8d1224c2b5f76e756d143a375)
---
 src/core/cgroup.c | 1 +
 src/core/unit.c   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 582cff69d1..44ea2364bc 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1535,6 +1535,7 @@ static int unit_realize_cgroup_now(Unit *u, ManagerState state) {
 }
 
 static void unit_add_to_cgroup_queue(Unit *u) {
+        assert(u);
 
         if (u->in_cgroup_queue)
                 return;
diff --git a/src/core/unit.c b/src/core/unit.c
index 1407e9fdb5..4b3e10f2ed 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3176,6 +3176,11 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
         if (!dual_timestamp_is_set(&u->state_change_timestamp))
                 dual_timestamp_get(&u->state_change_timestamp);
 
+        /* Let's make sure that everything that is deserialized also gets any potential new cgroup settings applied
+         * after we are done. For that we invalidate anything already realized, so that we can realize it again. */
+        unit_invalidate_cgroup(u, _CGROUP_MASK_ALL);
+        unit_invalidate_cgroup_bpf(u);
+
         return 0;
 }
 
-- 
2.16.4

Places

File 0022-core-when-coming-back-from-reload-reexec-reapply-all.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Places