shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

core/cgroup: Properly handle aborting a pending freeze operation

Browse Source 
We must thaw the cgroup even if cgroup.events/frozen=0 if a freeze
operation is in flight as it means the cgroup is already partially
frozen.
This commit is contained in:
msizanoen 2025-03-18 12:47:21 +07:00 committed by Mike Yuan
parent 3432d5e21f
commit 85d00912c0
1 changed files with 17 additions and 8 deletions

25
src/core/cgroup.c

@ -5222,6 +5222,7 @@ static int unit_cgroup_freezer_kernel_state(Unit *u, FreezerState *ret) {
int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
_cleanup_free_ char *path = NULL;
FreezerState current, next, objective;
bool action_in_progress = false;
int r;
assert(u);
@ -5236,14 +5237,21 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
CGroupRuntime *crt = unit_get_cgroup_runtime(u);
if (!crt || !crt->cgroup_path)
/* No realized cgroup = nothing to freeze */
goto skip;
goto finish;
r = unit_cgroup_freezer_kernel_state(u, &current);
if (r < 0)
return r;
if (current == objective)
goto skip;
if (current == objective) {
if (objective == FREEZER_FROZEN)
goto finish;
/* Skip thaw only if no freeze operation was in flight */
if (IN_SET(u->freezer_state, FREEZER_RUNNING, FREEZER_THAWING))
goto finish;
} else
action_in_progress = true;
if (next == freezer_state_finish(next)) {
/* We're directly transitioning into a finished state, which in theory means that
@ -5275,12 +5283,13 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
if (r < 0)
return r;
unit_set_freezer_state(u, next);
return 1; /* Wait for cgroup event before replying */
finish:
if (action_in_progress)
unit_set_freezer_state(u, next);
else
unit_set_freezer_state(u, freezer_state_finish(next));
skip:
unit_set_freezer_state(u, freezer_state_finish(next));
return 0;
return action_in_progress;
}
int unit_get_cpuset(Unit *u, CPUSet *cpus, const char *name) {