restore: restore freezer cgroup state

Issue checkpoint-restore#20. (Support C/R of frozen cgroup)

Patch restores freezer cgroup state between finalize_restore stages.
It should be done after first stage because we cannot unmap restorer blob
from frozen process, and before second stage because we must freeze processes
before they continue run.
We also need to move fini_cgroup between these stages to provide freezer
cgroup state restorer access to cgroup mount directories.
Error handlers contains fini_cgroup, so we are sure that fini_cgroup call
won't be missed.

Patch restores state only for one freezer cgroup from --freeze-cgroup option,
not all states from whole hierarchy, because CRIU supports checkpoint from
freezer cgroup hierarchy only with THAWED state, except root cgroup from
--freeze-cgroup option.

Signed-off-by: Evgeniy Akimov <[email protected]>
Signed-off-by: Eugene Batalov <[email protected]>

Author: wtf42

cgroup.c

@@ -100,6 +100,7 @@ static unsigned int n_sets;
 static CgSetEntry **rst_sets;
 static unsigned int n_controllers;
 static CgControllerEntry **controllers;
+static CgroupPropEntry *freezer_state;
 static char *cg_yard;
 static struct cg_set *root_cgset; /* Set root item lives in */
 static struct cg_set *criu_cgset; /* Set criu process lives in */
@@ -1077,6 +1078,43 @@ int prepare_cgroup_properties(void)
 	return 0;
 }
 
+int restore_freezer_state(void)
+{
+	char paux[PATH_MAX];
+	int ctrl_off, i;
+	CgroupDirEntry *entry;
+	CgControllerEntry *freezer_ctrl = NULL;
+
+	if (!freezer_state)
+		return 0;
+
+	for (i = 0; i < n_controllers; i++) {
+		CgControllerEntry *ctrl = controllers[i];
+
+		if (cgroup_contains(ctrl->cnames, ctrl->n_cnames, "freezer")) {
+			freezer_ctrl = ctrl;
+			break;
+		}
+	}
+
+	if (!freezer_ctrl) {
+		pr_err("Can't restore freezer cgroup state: root freezer cgroup not found\n");
+		return -1;
+	}
+
+	/*
+	 * Here we rely on --freeze-cgroup option assumption that all tasks are in a
+	 * specified freezer cgroup hierarchy, so we need to freeze only one root freezer cgroup.
+	 */
+	BUG_ON(freezer_ctrl->n_dirs != 1);
+	entry = freezer_ctrl->dirs[0];
+
+	ctrl_off = ctrl_dir_and_opt(freezer_ctrl, paux, sizeof(paux), NULL, 0);
+	snprintf(paux + ctrl_off, sizeof(paux) - ctrl_off, "/%s", entry->dir_name);
+
+	return restore_cgroup_prop(freezer_state, paux, ctrl_off);
+}
+
 static int restore_special_cpuset_props(char *paux, size_t off, CgroupDirEntry *e)
 {
 	int i, j;
@@ -1358,6 +1396,7 @@ int prepare_cgroup(void)
 	rst_sets = ce->sets;
 	n_controllers = ce->n_controllers;
 	controllers = ce->controllers;
+	freezer_state = ce->freezer_state;
 
 	if (n_sets)
 		/*

cr-restore.c

@@ -1915,7 +1915,6 @@ static int restore_root_task(struct pstree_item *init)
 		goto out_kill;
 
 	ret = prepare_cgroup_properties();
-	fini_cgroup();
 	if (ret < 0)
 		goto out_kill;
 
@@ -1958,8 +1957,11 @@ static int restore_root_task(struct pstree_item *init)
 	if (clear_breakpoints())
 		pr_err("Unable to flush breakpoints\n");
 
-	if (ret == 0)
+	if (ret == 0) {
 		finalize_restore();
+		ret = restore_freezer_state();
+	}
+	fini_cgroup();
 
 	/* Detaches from processes and they continue run through sigreturn. */
 	finalize_restore_detach(ret);

include/cgroup.h

@@ -9,6 +9,7 @@ int prepare_task_cgroup(struct pstree_item *);
 int prepare_cgroup(void);
 /* Restore things like cpu_limit in known cgroups. */
 int prepare_cgroup_properties(void);
+int restore_freezer_state(void);
 void fini_cgroup(void);
 
 struct cg_controller;