morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

core: support user manager with Condition[Memory/CPU/IO]Pressure

Browse Source 
Get the cgroup root path from the current PID, so that when
ran by the user manager we can get to the right path.
Eg: foo.slice:10% will check under:

/sys/fs/cgroup/user.slice/user-1000.slice/user@1000.service/foo.slice/cpu.pressure

Follow-up for 81513b382b
This commit is contained in:
Luca Boccassi
2021-12-01 14:16:24 +00:00
committed by Luca Boccassi
parent 8feb9fa4f8
commit 68ee5d774c
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/shared/condition.c
View File

@@ -45,6 +45,7 @@
#include "psi-util.h"
#include "selinux-util.h"
#include "smack-util.h"
#include "special.h"
#include "stat-util.h"
#include "string-table.h"
#include "string-util.h"
@@ -992,14 +993,14 @@ static int condition_test_psi(Condition *c, char **env) {
if (r == 1) {
pressure_path = path_join("/proc/pressure", pressure_type);
if (!pressure_path)
return log_oom();
return log_oom_debug();
value = first;
} else {
const char *controller = strjoina(pressure_type, ".pressure");
_cleanup_free_ char *slice_path = NULL;
_cleanup_free_ char *slice_path = NULL, *root_scope = NULL;
CGroupMask mask, required_mask;
char *slice;
char *slice, *e;
required_mask = c->type == CONDITION_MEMORY_PRESSURE ? CGROUP_MASK_MEMORY :
c->type == CONDITION_CPU_PRESSURE ? CGROUP_MASK_CPU :
@@ -1030,6 +1031,26 @@ static int condition_test_psi(Condition *c, char **env) {
if (r < 0)
return log_debug_errno(r, "Cannot determine slice \"%s\" cgroup path: %m", slice);
/* We might be running under the user manager, so get the root path and prefix it accordingly. */
r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, getpid_cached(), &root_scope);
if (r < 0)
return log_debug_errno(r, "Failed to get root cgroup path: %m");
/* Drop init.scope, we want the parent. We could get an empty or / path, but that's fine,
* just skip it in that case. */
e = endswith(root_scope, "/" SPECIAL_INIT_SCOPE);
if (e)
*e = 0;
if (!empty_or_root(root_scope)) {
_cleanup_free_ char *slice_joined = NULL;
slice_joined = path_join(root_scope, slice_path);
if (!slice_joined)
return log_oom_debug();
free_and_replace(slice_path, slice_joined);
}
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, slice_path, controller, &pressure_path);
if (r < 0)
return log_debug_errno(r, "Error getting cgroup pressure path from %s: %m", slice_path);