wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-09-30 13:02:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #498 from finit-project/misc-cgroup

Browse Source 
Misc cgroup fixes

Fixes #497
This commit is contained in:
Joachim Wiberg
2026-08-13 08:15:59 +02:00
committed by GitHub
parent d2781ef655 1843c24cda
commit ae9a24f44f
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/config/cgroups.md
+3 -1
View File
@@ -42,7 +42,9 @@ the above three. We leave `init/` and `user/` as-is reducing weight of
cgroup maint { cpu.weight = 100 }
By default, the `system/` cgroup is selected for almost everything. The
`init/` cgroup is reserved for PID 1 itself and its closest relatives.
`init/` cgroup is reserved for the early boot helpers Finit drives
itself, like udev and mdev. PID 1 runs in the root cgroup, since a
cgroup holding processes cannot delegate controllers to its children.
The `user/` cgroup is for local TTY logins spawned by getty.
Joining a Cgroup
src/cgroup.c
+9 -18
View File
@@ -339,6 +339,10 @@ static int cgroup_create(const char *group, const char *name, const char *cfg,
NULL
};
/* non-root delegated services needs permission to mkdir() */
if (chown(path, uid, gid))
warn("Failed chown %s to %d:%d", path, uid, gid);
for (int i = 0; files[i]; i++) {
snprintf(filepath, sizeof(filepath), "%s/%s", path, files[i]);
if (chown(filepath, uid, gid))
@@ -410,9 +414,6 @@ int cgroup_service(const char *name, int pid, struct cgroup *cg, char *username,
if (!strcmp(cg->name, "root"))
return fnwrite(str("%d", pid), FINIT_CGPATH "/cgroup.procs");
if (!strcmp(cg->name, "init"))
return fnwrite(str("%d", pid), FINIT_CGPATH "/init/cgroup.procs");
snprintf(path, sizeof(path), "/sys/fs/cgroup/%s", cg->name);
if (fisdir(path))
group = cg->name;
@@ -814,7 +815,6 @@ int cgroup_del_svc(svc_t *svc, const char *name)
return cgroup_del(path);
}
/* the top-level init cgroup is a leaf, that's ensured in cgroup_init() */
void cgroup_config(void)
{
struct cg *cg;
@@ -824,15 +824,12 @@ void cgroup_config(void)
TAILQ_FOREACH(cg, &cgroups, link) {
char path[256];
int leaf = 0;
if (!cg->active)
continue;
if (!strcmp(cg->name, "init"))
leaf = 1; /* reserved */
snprintf(path, sizeof(path), "%s/%s", FINIT_CGPATH, cg->name);
group_init(path, leaf, cg->cfg);
group_init(path, 0, cg->cfg);
strlcat(path, "/cgroup.events", sizeof(path));
iwatch_add(&iw_cgroup, path, 0);
@@ -936,20 +933,14 @@ void cgroup_init(uev_ctx_t *ctx)
goto abort;
}
/* Default (protected) groups, PID 1, services, and user/login processes */
/*
* Protected groups. PID 1 stays in the root cgroup, a group with
* processes in it cannot delegate controllers to its children.
*/
cgroup_add("init", "cpu.weight:100", 1);
cgroup_add("system", "cpu.weight:9800", 1);
cgroup_add("user", "cpu.weight:100", 1);
cgroup_config();
/* Move ourselves to init (best effort, otherwise run in 'root' group */
if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs")) {
err(1, "Failed moving PID 1 to cgroup %s", FINIT_CGPATH "/init");
uev_io_stop(&cgw);
iwatch_exit(&iw_cgroup);
close(fd);
goto abort;
}
}
/**