mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

cgroup: Add support for restoring a thread in a correct v1 cgroup

Browse Source 
Currently we have checkpoint/restore support only of cgroup v2 threaded
controllers. Threads originating in cgroup v1 environments will be
restored to the main thread's cgroup. This change extends the support
for a cgroups v1.

Signed-off-by: Stepan Pieshkin <stepanpieshkin@google.com>
This commit is contained in:
Stepan Pieshkin 2024-02-02 07:03:05 +00:00 committed by Andrei Vagin
parent 835afb1b88
commit a0a6ec3dc0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
criu/cgroup.c
View File

@ -427,10 +427,11 @@ static int dump_cg_props_array(const char *fpath, struct cgroup_dir *ncd, const
} }
/* /*
* Set the is_threaded flag if cgroup.type's value is threaded, * Set the is_threaded flag if cgroup.type's value is threaded
* ignore all other values. * or it is a cgroup v1 (it has a 'tasks' property).
* Ignore all other values.
*/ */
if (!strcmp("cgroup.type", prop->name) && !strcmp("threaded", prop->value)) if ((!strcmp("cgroup.type", prop->name) && !strcmp("threaded", prop->value)) || !strcmp("tasks", prop->name))
controller->is_threaded = true; controller->is_threaded = true;
pr_info("Dumping value %s from %s/%s\n", prop->value, fpath, prop->name); pr_info("Dumping value %s from %s/%s\n", prop->value, fpath, prop->name);
@ -1922,7 +1923,7 @@ static int prepare_cgroup_sfd(CgroupEntry *ce)
if (ctrl->cnames[0][0] == 0) if (ctrl->cnames[0][0] == 0)
fstype = "cgroup2"; fstype = "cgroup2";
pr_debug("\tMaking controller dir %s (%s)\n", paux, opt); pr_debug("\tMaking controller dir %s (%s), type %s\n", paux, opt, fstype);
if (mkdir(paux, 0700)) { if (mkdir(paux, 0700)) {
pr_perror("\tCan't make controller dir %s", paux); pr_perror("\tCan't make controller dir %s", paux);
return -1; return -1;
@ -1985,6 +1986,7 @@ static int cgroupd(int sk)
CgMemberEntry *ce = cg_set_entry->ctls[i]; CgMemberEntry *ce = cg_set_entry->ctls[i];
char aux[PATH_MAX]; char aux[PATH_MAX];
CgControllerEntry *ctrl = NULL; CgControllerEntry *ctrl = NULL;
const char *format;
for (j = 0; j < n_controllers; j++) { for (j = 0; j < n_controllers; j++) {
CgControllerEntry *cur = controllers[j]; CgControllerEntry *cur = controllers[j];
@ -2008,7 +2010,8 @@ static int cgroupd(int sk)
continue; continue;
aux_off = ctrl_dir_and_opt(ctrl, aux, sizeof(aux), NULL, 0); aux_off = ctrl_dir_and_opt(ctrl, aux, sizeof(aux), NULL, 0);
snprintf(aux + aux_off, sizeof(aux) - aux_off, "/%s/cgroup.threads", ce->path); format = ctrl->cnames[0][0] ? "/%s/tasks" : "/%s/cgroup.threads";
snprintf(aux + aux_off, sizeof(aux) - aux_off, format, ce->path);
/* /*
* Cgroupd runs outside of the namespaces so we don't * Cgroupd runs outside of the namespaces so we don't